[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] How to avoid conflict when backporting/cherypicking

From: Aaron Bentley
Subject: Re: [Gnu-arch-users] How to avoid conflict when backporting/cherypicking
Date: Tue, 17 Aug 2004 15:38:06 -0400
User-agent: Mozilla Thunderbird 0.5 (X11/20040309)

Matthew Dempsky wrote:
tree-sync is one of those commands which is not yet clear to me...

For the most part, you'll probably only need it when using replay
--skip-present and you don't want missing to list the skipped patches

Actually, I use sync-tree as part of a two-step operation I call "reject".

You use this when you want to remove an already-committed patch from your tree in a fairly pernanent way. The operation is:

tla replay --reverse UNWANTED-REVISION

This undoes the patch, but in such a way that it seems as though the patch's *changes* were manually undone. Since this change will also get a patchlog, you can summarize it "rejected UNWANTED-REVISION".

This is one way you can undo your last commit, if you realized you screwed up.


Aaron Bentley
Director of Technology
Panometrics, Inc.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]