bugmonotone - Bugs: bug #5677, add "monotone...

 
 

You are not allowed to post comments on this tracker with your current authentication level.

bug #5677: add "monotone cherrypick" command

Submitted by:  graydon hoare <graydon>
Submitted on:  Wed 01 Oct 2003 10:07:27 PM UTC  
Votes:  10  
 
Category: command line UISeverity: 3 - Normal
Item Group: feature requestStatus: Fixed
Privacy: PublicAssigned to: None
Open/Closed: Closed
mtn version --full: 

Mon 17 Jul 2006 04:16:31 AM UTC, comment #3:

Implemented as 'mtn pluck'.

Timothy Brownawell <tbrownaw>
Project Member
Mon 20 Feb 2006 11:38:48 AM UTC, comment #2:

Lack of cherrypicking make copying changeset between branches hard. I maintain two branches (one devel and one stable) and from time to time I copy changesets from one to other. Now I do it by hand but with changes like "10 renamed, 20 moved to other dir, 3 added, 9 modified" its hard.

Marcin Juszkiewicz <hrw>
Thu 09 Oct 2003 11:57:28 PM UTC, comment #1:

If you want to get really fancy, could cert that this has occurred, and then later merges could notice that cert and instead of merging P and R directly, you first merge R with Q, then declare the result to be a child of not Q but rather P, and merge again.

Of course life is probably more complicated than that, but hopefully you get the idea. In many cases, it should in principle be possible to get a lot of the changeset-y advantages here wrt repeated merges...

Nathaniel Smith <njs>
Project Member
Wed 01 Oct 2003 10:07:27 PM UTC, original submission:

(or perhaps "migrate", or "transplant"?)
this should take versions P, Q, and R. should calculate

A=LCA(P,R)
D=diff(P,Q),
M=diff(A,P), N=diff(A,R)
X=offsets(N) | offsets(M)
and apply merge(D,X,R)

assuming that even makes sense. I think it does. need to confirm with a lot of tests.

graydon hoare <graydon>
Project Member

 

No files currently attached

 

Digest:
   bug dependencies.

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 10 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 6 latest changes.

Date Changed By Updated Field Previous Value => Replaced By
Mon 17 Jul 2006 04:16:31 AM UTCtbrownawStatusNone=>Fixed
  Open/ClosedOpen=>Closed
Mon 20 Feb 2006 11:38:48 AM UTChrwCarbon-Copy-=>Added hrw
Sun 20 Feb 2005 05:48:21 AM UTCnjsSummary\=>add "monotone cherrypick" command
Sun 20 Feb 2005 05:47:48 AM UTCnjsSummary"monotone cherrypick" command=>\
  Dependencies-=>Depends on bugs #12043

Back to the top


Powered by Savane 3.1-cleanup1