Mercurial > hg-stable
view tests/test-diffdir @ 6385:0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do. This fixes issue 1049.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 24 Mar 2008 15:36:56 -0700 |
parents | f80cf8b7bbd9 |
children |
line wrap: on
line source
#!/bin/sh hg init touch a hg add a hg ci -m "a" -d "1000000 0" echo 123 > b hg add b hg diff --nodates hg diff --nodates -r tip echo foo > a hg diff --nodates hg diff -r "" hg diff -r tip -r "" true