[darcs-users] Request: porting patches advice (can I get rid of/ignore dependencies?)
Jonathan.Wright at orionhealth.com
Fri May 7 04:36:51 UTC 2004
At one stage I tried something akin to what you list below. At your uncertain step (number 5), after you choose not to accept the initial patch it refuses to go on and implies that you wasted its time. :)
Do you have any ideas as to how to make it ignore that patch?
My naïve guess is that the later patches depend on the initial one. Since I choose not to use the initial patch, it refuses to pull any patches that depend on it. Which means it refuses to pull any other patches.
Could I manually edit the IDs of the initial patches? So I could trick darcs into thinking the 1.0 (old) and 1.1 (new) VSS branches are the same patch.
From: Kevin Smith [mailto:yarcs at qualitycode.com]
Sent: Friday, 7 May 2004 4:30 p.m.
To: Jonathan Wright
Subject: Re: [darcs-users] Request: porting patches advice (can I get rid of/ignore dependencies?)
Jonathan Wright wrote:
> Is there a way to extract a bunch of patches from a repository and apply
> them on an unrelated repository ignoring dependencies?
Here's what jumps into my mind (but I'm interested to hear other responses):
1. In a brand new directory, VSS Get the old branch you need to fix up
2. darcs inittree and record it, and tag it
3. VSS Get (into this same directory) the "current" code that you
started your first darcs repo with
4. darcs record that (and probably tag it, just for fun)
5. darcs pull the patches from the first repo to this new repo, skipping
the initial record [this is where I am uncertain--hopefully each of your
"new" darcs patches could be applied to this new repo, since the file
contents are all the same as they were before]
5.5 Compare to make sure the first and second darcs repo working
directories are identical
6. In yet another directory, darcs get the tag you created in #2
7. darcs pull from that repo, but don't pull the big patch that changed
the repo from the old branch to the current VSS code--just pull the rest
8. Resolve conflicts, test, fix, and tag
More information about the darcs-users