On Tue, Jan 03, 2006 at 06:36:17AM -0800, Mark Lentczner wrote:
> On Jan 1, 2006, at 5:36 PM, Tommy Pettersson wrote:
> >Instead of recording conflict resolutions as new patches,
> >you can amend your conflicting patches with the resolutions,
> >which brings them "on top" of main line. It requires some
> >care not to amend pushed patches, and darcs can't currently
> >help mush.
>
> If my ~/working directory has been pushed to several other machines
> (so that I can work on my code in different environments, or so that
> more than one developer can work on this branch), then I'd have to
> make sure that I went to all those machines and unpulled the patch.
> And then later let them get the amended version. Sounds unworkable
> in general.
Yes, it only works for a one-person/single-repo branch.
> If this is really the only way to handle this situation, then perhaps
> what darcs needs is the ability to record an anti-patch dependency.
> This would trigger something like: "If you're going to pull this
> patch, darcs must unpull this other patch first. Unpull it?".
This won't work well if the other developers have made patches
that depend on the patch that needs to be unpulled.
> >You can keep a temporary tag that you unrecord
> >before pushing and tag anew afterwards, that depends on,
> >and thus protects, previous patches.
>
> Keep this tag where? In working or in base? I don't understand the
> procedure you are suggesting.
In working.
* darcs tag BEGIN
repeat: {
* [create new patches]
* darcs pull base
* [edit to resolve conflicts]
* darcs amend
(Amend will not allow you to select a patch tagged by BEGIN
(or tagged by any patch at all), but it's unfortunately
still possible to select one of the patches pulled
from base.)
}
time to push:
* darcs unrecord -t BEGIN
* darcs push base
* darcs tag BEGIN (protect newly pushed patches)
--
Tommy Pettersson <[EMAIL PROTECTED]>
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
