Mercurial > hg
view tests/test-diff-subdir @ 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 | 096f1c73cdc3 |
children |
line wrap: on
line source
#!/bin/sh hg init mkdir alpha touch alpha/one mkdir beta touch beta/two hg add alpha/one beta/two hg ci -m "start" -d "1000000 0" echo 1 > alpha/one echo 2 > beta/two echo EVERYTHING hg diff --nodates echo BETA ONLY hg diff --nodates beta echo INSIDE BETA cd beta hg diff --nodates .