bzr merge shows file as modified although they did not change
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
Breezy |
Triaged
|
Low
|
Unassigned |
Bug Description
Today I ran into a strange issue, 'bzr merge' showed me a file as (M)odified but according to 'bzr diff' and 'bzr status' this file did not change at all.
Please ping me if any more information is needed.
Markus
markus@thekorn:~$ cd /tmp
markus@
Branched 105 revision(s).
markus@
Branched 139 revision(s).
markus@
markus@
M debian/changelog
M launchpadbugs/
All changes applied successfully.
markus@
modified:
debian/changelog
pending merges:
Brian Murray 2008-06-26 updated debian/changelog for revno 104
Markus Korn 2008-06-26 * launchpadbugs/
markus@
=== modified file 'debian/changelog'
--- debian/changelog 2008-06-20 21:58:41 +0000
+++ debian/changelog 2008-06-26 21:26:53 +0000
@@ -4,6 +4,8 @@
* launchpadbugs/
workaround for broken libxml2 (LP: #220679)
* launchpadbugs/
+ * launchpadbugs/
+ is not allowed to change values (LP: #243057)
* launchpadbugs/
HTTPConnne
* More robust parser for the +text-mode:
@@ -24,7 +26,7 @@
* launchpadbugs/
supervisor
- -- Markus Korn <email address hidden> Fri, 20 Jun 2008 23:55:08 +0200
+ -- Brian Murray <email address hidden> Thu, 26 Jun 2008 13:09:35 -0700
python-
markus@
Bazaar (bzr) 1.3.1
Python interpreter: /usr/bin/python 2.5.2.final.0
Python standard library: /usr/lib/python2.5
bzrlib: /usr/lib/
Bazaar configuration: /home/markus/
Bazaar log file: /home/markus/
Copyright 2005, 2006, 2007, 2008 Canonical Ltd.
http://
bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.
Changed in bzr: | |
status: | Triaged → Confirmed |
tags: | added: merge ui |
tags: | removed: ui |
tags: | added: check-for-breezy |
tags: | removed: check-for-breezy |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → Low |
Confirmed. The revisions in play are:
main: 105 <email address hidden>
into
new: 139 <email address hidden>
My best guess is that there is a change from "main" but the target text already exists. So the part that says "what is from the source" said something changed, but it actually was a "no-op" when updating the target, because the text was already "target" at that point.