OK, but doesn't cherry-pick work the same as a MERGE but only for single
version of the timeline?
My intent was to get all changes from the branch (the whole history) but for
specific files, only.
-----Original Message-----
From: Richard Hipp
Sent: Wednesday, October 28, 2015 6:00 PM
To: Fossil SCM user's discussion
Subject: Re: [fossil-users] Question about MERGE
On 10/28/15, to...@acm.org <to...@acm.org> wrote:
Today I tried something and got an unexpected result. So, I would like to
know what the right way would have been.
I created a new branch and made a whole bunch of changes. Some of these
changes were tested, and so I decided to merge them in to the trunk.
I did this by going to trunk, and the MERGE the other branch. But, then,
I
REVerted the files whose changes I did not want included yet (as they are
not fully tested).
I committed the result to the trunk.
Then I tried to merge that other branch again, and I expected to get the
rest of the files merged in. But, instead I got a no-op error.
So, how could I have this correctly?
Cherry-pick the changes you wanted to import.
When you did "fossil merge" that told Fossil that your intent was that
everything in the branch had been integrated into the trunk. You went
back and undid some of those changes using "fossil revert", but Fossil
understood that to be your intent - that you wanted to abandon those
changes.
--
D. Richard Hipp
d...@sqlite.org
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
