Mercurial > hg
view tests/test-merge-force.t @ 20763:0132cbe30c41
hgk: ignore ctrl-z as EOF on windows
Port a patch from gitk. Original description:
Cygwin's Tcl is configured to honor any occurence of ctrl-z as an
end-of-file marker, while some commits in the git repository and possibly
elsewhere include that character in the commit comment. This causes gitk
ignore commit history following such a comment and incorrect graphs. This
change affects only Windows as Tcl on other platforms already has
eofchar == {}. This fixes problems noted by me and by Ray Lehtiniemi, and
the fix was suggested by Shawn Pierce.
Signed-off-by: Mark Levedahl <mdl123@verizon.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
author | Andrew Shadura <andrew@shadura.me> |
---|---|
date | Sat, 15 Mar 2014 15:33:50 +0100 |
parents | 94c394653b2a |
children | eeecf29cc397 |
line wrap: on
line source
$ hg init $ echo a > a $ hg ci -qAm 'add a' $ echo b > b $ hg ci -qAm 'add b' $ hg up -qC 0 $ hg rm a $ hg ci -m 'rm a' created new head $ hg up -qC 1 $ rm a Local deleted a file, remote removed Should fail, since there are deleted files: $ hg merge abort: uncommitted changes (use 'hg status' to list changes) [255] Should succeed with --force: $ hg -v merge --force resolving manifests removing a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) Should show 'a' as removed: $ hg status R a $ hg ci -m merge Should not show 'a': $ hg manifest b