[darcs-users] pull-unders
zooko at zooko.com
zooko at zooko.com
Tue Sep 13 17:03:06 UTC 2005
Tuomo Valkonen wrote:
>
> Simply darcs pulling from an
> unrelated repository obviously will seldom work (infact, IMHO, darcs should
> never even try to do that; there could e.g. be some unique root patch
> created by darcs init that never commutes),
I do this, but only when both of the darcs projects began their history in a
separate top-level directories. It adds a somewhat irritating layer of
directories which my users have complained about, but it allows me to do this.
E.g.:
https://yumyum.zooko.com:19144/cgi-bin/darcs.cgi/pyutil
The best possible way to allow this functionality without requiring a separate
top-level directory from the beginning of history would be for darcs patch
theory to be fixed so that a user can encounter such a conflict, resolve it by
preserving both files (and their histories) but under separate names, and
everything else would commute cleanly through that disambiguation.
Regards,
Zooko
More information about the darcs-users
mailing list