Stephen J. Turnbull wrote:
Daniel Carrera writes:
> Can you suggest a better example?
No. To be honest, I love git.
I think I have an example. It is of the form "a (potential) conflict
that Darcs detects and git doesn't". In summary, it's about whether two
identical patches should be a conflict or not.
mkdir b1
cd b1
git init
echo 1 > num_file
git add num_files
git commit
cd ..
git clone b1 b2
cd b2
echo 'hi' > foo
echo 2 > num_files
git add foo num_files
git commit
cd ..
cd b1
echo 'hi' > bar
echo 2 > num_files
git add bar num_files
git commit
git pull ../b2
In this instance git happily merges and darcs sees a conflict. Darcs
behaviour is correct. There is no way for the program to know if two
identical changes are a conflict or not.
Daniel.
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
