Hello,
Thanks for the info about branches. After thinking about it for a while,
I have a new question. In the previous thread I learned that to make a
changeset I need read access to both repositories. But consider this
scenario:
* We have a stable repository (http://my.server.com/stable).
* Joel makes a copy and starts working on feature A.
* Jane makes a copy and starts working on feature B.
Suppose that neither Joel nor Jane have their repository on a public
server. Suppose they only have the common ansestor (stable).
How do we merge these two brances? I can see one way to merge them:
1. Joel makes another copy of stable
cp -r foo/ stable/
cd stable
darcs unrecord
2. Jane sends patch B to Joel.
3. Joel applies patch B to his copy of stable.
4. Joel now has a local copy of Jane's tree and can do the merge.
Is this the correct solution? Or is Darcs smart enough to do this merge
automatically? If so, how?
Cheers,
Daniel.
--
/\/`) http://oooauthors.org
/\/_/ http://opendocumentfellowship.org
/\/_/ No trees were harmed in the creation of this email.
\/_/ However, a significant number of electrons were
/ were severely inconvenienced.
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
