Mercurial > public > mercurial-scm > hg-stable
diff tests/test-git-export.t @ 19973:1184edaead7a stable
patch: ensure valid git diffs if source/destination file is missing (issue4046)
This is arguably a workaround, a better fix may be in the repo to
ensure that it won't list a file 'modified' unless there is a file
context for the previous version.
| author | Johan Bjork <jbjoerk@gmail.com> |
|---|---|
| date | Sun, 13 Oct 2013 08:38:30 -0400 |
| parents | c172660eee01 |
| children | e22248f6d257 |
line wrap: on
line diff
--- a/tests/test-git-export.t Sun Oct 27 00:24:25 2013 +0900 +++ b/tests/test-git-export.t Sun Oct 13 08:38:30 2013 -0400 @@ -360,3 +360,23 @@ +foo $ hg ci -m 'add filename with spaces' +Additions should be properly marked even in the middle of a merge + + $ hg up -r -2 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ echo "New File" >> inmerge + $ hg add inmerge + $ hg ci -m "file in merge" + created new head + $ hg up 23 + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg merge + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg diff -g + diff --git a/inmerge b/inmerge + new file mode 100644 + --- /dev/null + +++ b/inmerge + @@ -0,0 +1,1 @@ + +New File