[Bug 5360] New: annotate shows wrong history of the chunk deleted by p1 of a merge changeset
bugzilla at mercurial-scm.org
bugzilla at mercurial-scm.org
Sun Sep 4 17:16:17 UTC 2016
https://bz.mercurial-scm.org/show_bug.cgi?id=5360
Bug ID: 5360
Summary: annotate shows wrong history of the chunk deleted by
p1 of a merge changeset
Product: Mercurial
Version: default branch
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzilla at selenic.com
Reporter: arcppzju+hgbug at gmail.com
CC: mercurial-devel at selenic.com
Given the following repo:
@ 4:a692a7491dcf merge
|\ diff --git a/a b/a
| | --- a/a
| | +++ b/a
| | @@ -1,3 +1,5 @@
| | +b
| | 1
| | 2
| | 3
| | +a
| |
| o 3:ef5bbb0dc5fd commit 3
| | diff --git a/a b/a
| | --- a/a
| | +++ b/a
| | @@ -1,2 +1,3 @@
| | 1
| | 2
| | +3
| |
o | 2:857b65bb242f commit a
|/ diff --git a/a b/a
| --- a/a
| +++ b/a
| @@ -1,2 +1,1 @@
| -1
| -2
| +a
|
o 1:5a1412cdac94 commit 2
| diff --git a/a b/a
| --- a/a
| +++ b/a
| @@ -1,1 +1,2 @@
| 1
| +2
|
o 0:c9eaae12e79e commit 1
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,1 @@
+1
"hg annotate a" outputs:
4: b
1: 1
1: 2
3: 3
2: a
Where it should be:
4: b
0: 1
1: 2
3: 3
2: a
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list