Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
19972:1e13a5a9c66e | 19973:1184edaead7a |
---|---|
358 +++ b/with spaces | 358 +++ b/with spaces |
359 @@ -0,0 +1,1 @@ | 359 @@ -0,0 +1,1 @@ |
360 +foo | 360 +foo |
361 $ hg ci -m 'add filename with spaces' | 361 $ hg ci -m 'add filename with spaces' |
362 | 362 |
363 Additions should be properly marked even in the middle of a merge | |
364 | |
365 $ hg up -r -2 | |
366 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
367 $ echo "New File" >> inmerge | |
368 $ hg add inmerge | |
369 $ hg ci -m "file in merge" | |
370 created new head | |
371 $ hg up 23 | |
372 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
373 $ hg merge | |
374 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
375 (branch merge, don't forget to commit) | |
376 $ hg diff -g | |
377 diff --git a/inmerge b/inmerge | |
378 new file mode 100644 | |
379 --- /dev/null | |
380 +++ b/inmerge | |
381 @@ -0,0 +1,1 @@ | |
382 +New File |