Mercurial > hg-stable
view tests/test-diff-copy-depth @ 10185:7637fe4f525d stable
mq: preserve --git flag when merging patches
Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 Jan 2010 19:53:05 +0100 |
parents | 204a2ca249b6 |
children |
line wrap: on
line source
#!/bin/sh for i in aaa zzz; do hg init t cd t echo "-- With $i" touch file hg add file hg ci -m "Add" hg cp file $i hg ci -m "a -> $i" hg cp $i other-file echo "different" >> $i hg ci -m "$i -> other-file" hg cp other-file somename echo "Status": hg st -C echo echo "Diff:" hg diff -g echo cd .. rm -rf t done