bugArX revision control system - Bugs: bug #12885, Support merge -r (as described on...

 
 

bug #12885: Support merge -r (as described on the web page)

Submitted by:  Kevin Smith <kevinbsmith>
Submitted on:  Thu 28 Apr 2005 11:03:10 PM UTC  
 
Severity: 5 - NormalItem 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 30 Apr 2005 06:58:06 PM UTC, comment #1:

merge -r has been implemented for a while (arx.2.2,69). In this case, though, you probably want to use

arx merge arx.head

because that will update to a different branch, if I have moved on to arx.2.3.

Walter Landry <landry>
Project Administrator
Thu 28 Apr 2005 11:03:10 PM UTC, original submission:

Whenever you want to update your local system by merging in any new changes from the official ArX tree, use these commands (which will only work within a tree that was created with "arx get"):

cd arx
arx merge
arx inventory --nested --trees --default-output | xargs -n 1 arx merge --dir

The inventory command generates a list of all the subprojects, and the xargs part merges each subproject into the local archive. At some point, ArX will be enhanced to support a recursive merge, which would simplify the process to something like this:

cd arx
arx merge -r

Kevin Smith <kevinbsmith>
Project Member

 

(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 30 Apr 2005 06:58:06 PM UTClandryStatusNone=>Fixed
  Open/ClosedOpen=>Closed

Back to the top


Powered by Savane 3.1-cleanup1