[Gnu-arch-users] Re: Gnu-arch-users Digest, Vol 10, Issue 76

[Shawn Samuel]

The proper sequence to avoid the problem you mention is:

1,2. as below
3. When connected to the network, "darcs get" to get any new changes
that were made to the repository while you were disconnected.
   a. If there are any conflicting (non-commuting) changes, you'll get conflict 
markers.
      i. if you do, resolve them.
      ii. "darcs record" your changes to your local repository.
4. "darcs push" to upload your patches, which include the resolution
of any conflicts. 

shawn

> From: Stefan Monnier <address@hidden>
>
> > Lately I hve been poking around with darcs a bit, and the one really
> > nice thing about it is that it can automatically work "disconnected".
> 
> > Here's how that would work in darcs:
> 
> > 1. I do a darcs get to download the repository
> > 2. I hack around, using "darcs record" to commit each change
> >    Changes are only saved locally.
> > 3. When I have a network connection again, I "darcs push" to upload
> >    my changes to the server.
> 
> How does it handle the case where someone else has committed patches to the
> same branch in the mean time.  Of course it can try to reorder those patches
> using its patch-algebra (which is quite handy in this particular case), but
> what if there's a real conflict?
> 
> > B. I could mirror the remote repository to my local disk.
> >    Problems:
> >      1. I can't commit to this, or push changes back.
> >      2. Still takes a good deal of typing.
> 
> > Is there an easier way to do this?
> 
> You can use an archive cache (in a separate patch written by Aaron) which
> gets you the same as B but without the extra typing (you still can't
> commit, tho).
>