[darcs-users] Branching from a repos that pulls patches from me

[Eric Y. Kow]

On Tue, May 30, 2006 at 23:25:51 +0200, Daniel Déchelotte wrote:
> Here is the lengthy description: I have a "working" repository and
> another "safety" repository, which regularly pulls patches from the
> "working" one. I recorded 3 patches in "working" and "safety" pulled
> them; but now, I would like to go back to "working" without those last
> 3 patches.

So what you want to have is something like this?

before
------
W+3
S+3

after
-----
W
S+3

after some more work
--------------------
W+N
S+3+N

(you do N patches which safety pulls in)

If so, once you are sure that safety has the +3 patches you can just
obliterate them from working, no?

Out of curiosity, is there a risk of conflicts between the +3 and the
+N?

> I could create a "working_bis" repos, pulling everything from the
> "safety" repos but the last 3 patches, but then how can patches flow
> from "working_bis" to "safety"?

Note that darcs can pull from several repositories at once.  There is
a default --union behaviour, and an --intersection one as well.

-- 
Eric Kow                     http://www.loria.fr/~kow
PGP Key ID: 08AC04F9         Merci de corriger mon français.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 186 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20060531/924533a6/attachment.pgp