Hello,
I'd like to ask one of the more experienced people here to update the
docs for 'push' to explain what happens when there is a conflict.
I created this myself with some play archives. darcs will report
that the push succeeded, but also that there are conflicts.
But what state is the remote repo in after this? The local one? What
needs to happen to resolve the conflict?
I really think the CVS behavior makes more sense here: With CVS
I must resolve conflicts with the remote repo before committing.
With darcs, I seem to be able to 'push' changes even when there are
conflicts.
Why not follow the CVS behavior here? If there are conflicts with a
push:
- don't modify the remote repo
- mark the changes locally
- Tell the user to fix the conflicts and try again.
Short of this, I think some explicit documentation is needed to explain
what happens currently.
Mark
--
. . . . . . . . . . . . . . . . . . . . . . . . . . .
Mark Stosberg Principal Developer
mark-WmyhgDpj2fCHT8/ATrE1yw@xxxxxxxxxxxxxxxx Summersault, LLC
765-939-9301 ext 202 database driven websites
. . . . . http://www.summersault.com/ . . . . . . . .
|
