| 2007-05-10 13:37:34 |
Ian Jackson |
bug |
|
|
added bug |
| 2007-05-11 14:14:02 |
Robert Collins |
description |
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr diff
=== modified file 'debian/changelog'
--- debian/changelog 2007-04-27 15:06:24 +0000
+++ debian/changelog 2007-05-10 13:23:25 +0000
@@ -1,4 +1,10 @@
-autopkgtest (0.8.1feisty1~iwj2) feisty-updates; urgency=low
+autopkgtest (0.8.2feisty1~iwj) feisty-updates; urgency=low
+
+ * Fix readconfig.in to set adt_$var rather than just $var.
+
+ --
+
+autopkgtest (0.8.2) gutsy unstable; urgency=low
* Fix fd handling to work around Python's habit of closing files
you specify in subprocess.Popen.
=== modified file 'xen/readconfig.in'
--- xen/readconfig.in 2007-04-04 17:06:03 +0000
+++ xen/readconfig.in 2007-05-10 13:17:43 +0000
@@ -67,7 +67,7 @@
*) fail "unknown configuration variable \`$var'" ;;
esac
- eval "$var=\"\$value\""
+ eval "adt_$var=\"\$value\""
shift ;;
--) shift; break ;;
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ debcommit
bzr commit -m '* Fix readconfig.in to set adt_$var rather than just $var.'
bzr: ERROR: Conflicts detected in working tree. Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.
debcommit: commit failed
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr resolve debian/changelog
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ debcommit
bzr commit -m '* Fix readconfig.in to set adt_$var rather than just $var.'
bzr: ERROR: Conflicts detected in working tree. Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.
debcommit: commit failed
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr conflicts
Conflict adding file debian/changelog.BASE. Moved existing file to debian/changelog.BASE.moved.
Conflict adding file debian/changelog.OTHER. Moved existing file to debian/changelog.OTHER.moved.
Conflict adding file debian/changelog.THIS. Moved existing file to debian/changelog.THIS.moved.
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ rm debian/changelog
changelog changelog.OTHER.moved changelog~
changelog.BASE.moved changelog.THIS.moved
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ rm debian/changelog.
changelog.BASE.moved changelog.OTHER.moved changelog.THIS.moved
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ rm debian/changelog.
changelog.BASE.moved changelog.OTHER.moved changelog.THIS.moved
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ rm debian/changelog.
changelog.BASE.moved changelog.OTHER.moved changelog.THIS.moved
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr status
modified:
debian/changelog
xen/readconfig.in
unknown:
debian/changelog.BASE.moved
debian/changelog.OTHER.moved
debian/changelog.THIS.moved
conflicts:
Conflict adding file debian/changelog.BASE. Moved existing file to debian/changelog.BASE.moved.
Conflict adding file debian/changelog.OTHER. Moved existing file to debian/changelog.OTHER.moved.
Conflict adding file debian/changelog.THIS. Moved existing file to debian/changelog.THIS.moved.
pending merges:
Ian Jackson 2007-05-02 => unstable too
Ian Jackson 2007-05-02 merge bugfix changes from --ubuntu branch
Ian Jackson 2007-05-02 fix genkey typo
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ rm debian/changelog.
changelog.BASE.moved changelog.OTHER.moved changelog.THIS.moved
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ rm debian/changelog.
changelog.BASE.moved changelog.OTHER.moved changelog.THIS.moved
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ rm debian/changelog.*
bian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr status
modified:
debian/changelog
xen/readconfig.in
conflicts:
Conflict adding file debian/changelog.BASE. Moved existing file to debian/changelog.BASE.moved.
Conflict adding file debian/changelog.OTHER. Moved existing file to debian/changelog.OTHER.moved.
Conflict adding file debian/changelog.THIS. Moved existing file to debian/changelog.THIS.moved.
pending merges:
Ian Jackson 2007-05-02 => unstable too
Ian Jackson 2007-05-02 merge bugfix changes from --ubuntu branch
Ian Jackson 2007-05-02 fix genkey typo
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr resolve
0 conflict(s) auto-resolved.
Remaining conflicts:
Conflict adding file debian/changelog.BASE. Moved existing file to debian/changelog.BASE.moved.
Conflict adding file debian/changelog.OTHER. Moved existing file to debian/changelog.OTHER.moved.
Conflict adding file debian/changelog.THIS. Moved existing file to debian/changelog.THIS.moved.
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ less debian/changelog
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr status
modified:
debian/changelog
xen/readconfig.in
conflicts:
Conflict adding file debian/changelog.BASE. Moved existing file to debian/changelog.BASE.moved.
Conflict adding file debian/changelog.OTHER. Moved existing file to debian/changelog.OTHER.moved.
Conflict adding file debian/changelog.THIS. Moved existing file to debian/changelog.THIS.moved.
pending merges:
Ian Jackson 2007-05-02 => unstable too
Ian Jackson 2007-05-02 merge bugfix changes from --ubuntu branch
Ian Jackson 2007-05-02 fix genkey typo
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr resolve
0 conflict(s) auto-resolved.
Remaining conflicts:
Conflict adding file debian/changelog.BASE. Moved existing file to debian/changelog.BASE.moved.
Conflict adding file debian/changelog.OTHER. Moved existing file to debian/changelog.OTHER.moved.
Conflict adding file debian/changelog.THIS. Moved existing file to debian/changelog.THIS.moved.
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr rm debian/changelog.BASE
debian/changelog.BASE is not versioned.
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr rm debian/changelog.BASE.moved
debian/changelog.BASE.moved is not versioned.
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr resolve --all
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ bzr status
modified:
debian/changelog
xen/readconfig.in
pending merges:
Ian Jackson 2007-05-02 => unstable too
Ian Jackson 2007-05-02 merge bugfix changes from --ubuntu branch
Ian Jackson 2007-05-02 fix genkey typo
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ debcommit
bzr commit -m '* Fix readconfig.in to set adt_$var rather than just $var.'
modified debian/changelog
modified xen/readconfig.in
Committed revision 48.
ian@liberator:/work/AutomatedTesting/autopkgtest--ubuntu$ |
update performing two merges can lead to hard to diagnose situations and this should be fixed - the current proposed fix is to merge once, and stop if there are errors, then do the second merge if required. I thought there was another bug open about this but cannot find it. |
|
| 2007-05-11 14:14:02 |
Robert Collins |
title |
complains about conflicts in figments of its own imagination |
update performs two merges |
|
| 2007-05-11 14:14:17 |
Robert Collins |
bzr: status |
Unconfirmed |
Confirmed |
|
| 2007-05-11 14:14:17 |
Robert Collins |
bzr: importance |
Undecided |
High |
|
| 2007-05-11 14:14:17 |
Robert Collins |
bzr: statusexplanation |
|
|
|
| 2008-08-05 09:39:35 |
Andrew Bennetts |
description |
update performing two merges can lead to hard to diagnose situations and this should be fixed - the current proposed fix is to merge once, and stop if there are errors, then do the second merge if required. I thought there was another bug open about this but cannot find it. |
update performing two merges can lead to hard to diagnose situations and this should be fixed - the current proposed fix is to merge once, and stop if there are errors, then do the second merge if required. I thought there was another bug open about this but cannot find it.
This can be reproduced by having a checkout with a local commit that modifies a file, and an uncommitted modification of that file, and then doing "bzr update". There's a shell script that demonstrates this at <https://bugs.launchpad.net/bzr/+bug/113809/comments/6>. |
|
| 2008-12-13 19:29:29 |
David Strauss |
bug |
|
|
added attachment '113809.merge' (113809.merge) |
| 2008-12-13 19:30:51 |
David Strauss |
bzr: assignee |
|
davidstrauss |
|
| 2009-08-18 15:04:15 |
Craig Hewetson |
branch linked |
|
lp:~craighewetson/bzr/update_with_local_commit |
|
| 2009-09-28 03:41:19 |
Robert Collins |
bzr: assignee |
David Strauss (davidstrauss) |
|
|
| 2010-01-21 23:49:00 |
Gerard Krol |
attachment added |
|
prevent_merges.patch http://launchpadlibrarian.net/38202975/prevent_merges.patch |
|
| 2010-02-02 18:32:30 |
Gerard Krol |
branch linked |
|
lp:~gerard-/bzr/update |
|
| 2010-02-09 18:10:06 |
John A Meinel |
bzr: status |
Confirmed |
In Progress |
|
| 2010-02-09 18:10:06 |
John A Meinel |
bzr: assignee |
|
Gerard Krol (gerard-) |
|
| 2010-02-10 15:48:35 |
Launchpad Janitor |
branch linked |
|
lp:~vila/bzr/integration |
|
| 2010-02-10 18:17:36 |
Vincent Ladeuil |
bzr: status |
In Progress |
Fix Released |
|
| 2010-02-10 18:17:36 |
Vincent Ladeuil |
bzr: milestone |
|
2.2.0b1 |
|
