[darcs-users] request for clear docs for 'push' and conflicts

Taral taral at taral.net
Thu Oct 28 20:04:00 UTC 2004


On Thu, Oct 28, 2004 at 06:59:43PM +0200, Juliusz Chroboczek wrote:
> > I really think the CVS behavior makes more sense here: With CVS
> > I must resolve conflicts with the remote repo before committing. 
> 
> But Darcs is decentralised (you can do a merge between remote
> repositories) and asynchronous (you can perform a merge by e-mail).

Why not require that "darcs push" only works when we are a superset of
the remote repo?

-- 
Taral <taral at taral.net>
This message is digitally signed. Please PGP encrypt mail to me.
A: Because it fouls the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing on usenet and in e-mail?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20041028/a3e65ee5/attachment.pgp 


More information about the darcs-users mailing list