Mercurial > hg-stable
view tests/test-diff-binary-file @ 11063:eb23c876c111
tag: warn users about tag/branch possible name conflicts
As reported recently, Mercurial users can easily find confusion when
using a common name for a tag and a branch. It seems reasonable to warn
them about this potential outcome, to avoid that "surprise".
* Explain briefly the issue in "hg help tag"
* Warn when tagging a revision
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Mon, 19 Apr 2010 17:41:12 +0900 |
parents | 6c82beaaa11a |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a cp $TESTDIR/binfile.bin . hg add binfile.bin hg ci -m 'add binfile.bin' echo >> binfile.bin hg ci -m 'change binfile.bin' hg revert -r 0 binfile.bin hg ci -m 'revert binfile.bin' echo % diff -r 0 -r 1 hg diff --nodates -r 0 -r 1 echo % diff -r 0 -r 2 hg diff --nodates -r 0 -r 2 echo % diff --git -r 0 -r 1 hg diff --git -r 0 -r 1 echo % diff --git -r 0 -r 2 hg diff --git -r 0 -r 2