bugGNU arch -- a revision control system - Bugs: bug #7020, tla does not combine multiple...


bug #7020: tla does not combine multiple rejects

Submitter:  James Blackwell <jblack>
Submitted:  Tue 30 Dec 2003 05:16:58 AM UTC
Category:  tla Severity:  2 - Minor
Item Group:  small feature idea Status:  None
Privacy:  Public Open/Closed:  Open
Release:  tla-1.2
Fixed Release: 
Merge Request?:  None
Your Archive Name: 
Your Archive Location: 
Assigned to:  None
* Mandatory Fields

Add a New Comment Rich Markup

Fri 09 Jan 2004 10:17:12 PM UTC, comment #2: 

BTW, I didn't put those angle-brackets around the revision names in the example I gave!

Yet another case of wacky-ass savannah `email' address munging I guess... though in this case it doesn't even seem to have tried to spam-proof them, so I don't know what it was trying to do.

Miles Bader <miles>
Fri 09 Jan 2004 10:03:50 PM UTC, comment #1: 

Is this really desirable though?

Knowing that different rejects came from different changesets is useful, though obviously the way arch implements currently can be hard to use.

Hmmm, since patch files can contain arbitrary text interspersed with the diffs, how about making tla somehow append to .rej files, e.g.:

   Rejects from foo@bar--baz/ack--barf--0--patch-9:
   <diff 1>

   Rejects from foo@bar--baz/ack--barf--0--patch-10:
   <diff 2>


Since it's `patch' that makes the .rej files (I think!) it would be quite as simple as that, but tla could -- maybe in addition to moving all .orig/.rej files into a separate directory -- append old .rej files onto the end of a similarly named .old-rejs file, with a format like the above.

Food for thought anyway...

I do find the current system a bit problematic, as I tend to not notice the +...old-rejs... directories that tla creates until much later.

Miles Bader <miles>
Tue 30 Dec 2003 05:16:58 AM UTC, original submission:  

Currently, when updating or replaying, multiple rejects do not result in a cumulative reject file.

Tim Waugh has made a patchutils package at http://cyberelk.net/tim/patchutils/, which has a patch combiner. It may be possible to take Tim's code and add reject unification abilities to arch.

James Blackwell <jblack>


(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach Files:

No files currently attached


Depends on the following items: None found

Items that depend on this one: None found


CC list is empty


There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

Only logged-in users can vote.


No changes have been made to this item

Back to the top

Powered by Savane 3.13-3cd0.
Corresponding source code