bugArX revision control system - Bugs: bug #4781, star merge idiom

 
 

bug #4781: star merge idiom

Submitted by:  Walter Landry <landry>
Submitted on:  Sun 17 Aug 2003 02:33:20 AM UTC  
 
Severity: 1 - FeatureItem Group: None
Status: FixedPrivacy: Public
Assigned to: NoneOpen/Closed: Closed

Add a New Comment(Rich Markup)
   

You are not logged in

Please log in, so followups can be emailed to you.

 

Sat 17 Apr 2004 02:23:14 PM UTC, comment #1:

Something like this has been implemented in package-framework--arx--1.0--patch-329.

Walter Landry <landry>
Project Administrator
Sun 17 Aug 2003 02:33:20 AM UTC, original submission:

Robert Collins <rbcollins@cygwin.com> wrote:

> I used the following idiom a lot:
>
> larch get foo mergedir
> larch star-merge --in-place foo bar ./mergedir
>
> which always does a two-phase merge. Yet, the delta from foo to
> mergedir is always nothing.
>
> Is this an optimisation that would be worth adding somewhere (that is,
> to consider the target dir == to 'A' ?


How about an optimization that there is no initial dir, so you would
do something like

arx star-merge --no-project-tree foo bar ./mergedir

Otherwise, I'd worry about getting funny patches because you think
that mergedir==foo, but it isn't.

Also, do you know how long it takes to apply that extra delta?
Particularly with the sped-up mkpatch?

Walter

Walter Landry <landry>
Project Administrator

 

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

Attach File(s):
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

Do you think this task is very important?
If so, you can click here to add your encouragement to it.
This task has 0 encouragements so far.

Only logged-in users can vote.

 

Please enter the title of George Orwell's famous dystopian book (it's a date):

 

 

Follow 2 latest changes.

Date Changed By Updated Field Previous Value => Replaced By
Sat 17 Apr 2004 02:23:14 PM UTClandryStatusNone=>Fixed
  Open/ClosedOpen=>Closed

Back to the top


Powered by Savane 3.1-cleanup1