Bazaar

InvalidEntryName: Problem merging with a single conflict: rename appears out of nowhere

Bug #579733 reported by Neil Martinsen-Burrell on 2010-05-13

This bug report is a duplicate of: Bug #660935: bzrlib.errors.InvalidEntryName when resolving path conflict. Edit Remove

This bug affects 1 person

Affects		Status	Importance	Assigned to	Milestone
	Bazaar	Confirmed	Medium	Unassigned

Bug Description

I have two branches, ~/Teaching and ~/teaching-current. They are diverged and have both changed the same file.

nmb@guttle[~]$ bzr log -v -n0 --show-ids -r 697.. Teaching
------------------------------------------------------------
revno: 700
revision-id: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Thu 2010-05-06 16:19:47 -0500
message:
  hw thru 5, posted
modified:
  math214/grades_214.ods grades_214.ods-20100501235851-u7bbyio8o882k3hf-1
------------------------------------------------------------
revno: 699
revision-id: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Thu 2010-05-06 16:03:42 -0500
message:
  stuff for the first exam
added:
  math214/exam1/ math214exam1-20100506204148-b0bs195cakwvsntq-1
  math214/exam1/concept_map.tex concept_map.tex-20100506204206-76zak0pkg7m5hn36-1
  math214/exam1/exam1.tex exam1.tex-20100506204206-76zak0pkg7m5hn36-2
  math214/exam1/review.tex review.tex-20100506204206-76zak0pkg7m5hn36-4
------------------------------------------------------------
revno: 698
revision-id: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Thu 2010-05-06 09:56:56 -0500
message:
  paper airplane grades
modified:
  math214/grades_214.ods grades_214.ods-20100501235851-u7bbyio8o882k3hf-1
------------------------------------------------------------
revno: 697
revision-id: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Wed 2010-05-05 12:57:46 -0500
message:
  slides for the second half of class
added:
  math214/lectures/sullivan_ch3a.pdf sullivan_ch3a.pdf-20100505175733-lbn44jwegu4lzgol-1
  math214/lectures/sullivan_ch3b.pdf sullivan_ch3b.pdf-20100505175733-lbn44jwegu4lzgol-2
modified:
  math214/lectures/chapter3.tex chapter3.tex-20100505032300-ol9pkynrdjzrmz6w-1

nmb@guttle[~]$ bzr log -v -n0 --show-ids -r 697.. teaching-current
------------------------------------------------------------
revno: 703
revision-id: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Wed 2010-05-12 16:16:12 -0500
message:
  reading Qs and hw thru 9
modified:
  math214/grades_214.ods grades_214.ods-20100501235851-u7bbyio8o882k3hf-1
------------------------------------------------------------
revno: 702
revision-id: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Wed 2010-05-12 11:47:02 -0500
message:
  revised semester project
modified:
  math214/semester-project.tex semesterproject.tex-20100512142007-54edmcj1z6ma460c-1
------------------------------------------------------------
revno: 701
revision-id: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Wed 2010-05-12 09:43:00 -0500
message:
  added semester project info
added:
  math214/lectures/chapter7a.pdf chapter7a.pdf-20100512141934-02ndwxvbpknxcw78-1
  math214/semester-project.tex semesterproject.tex-20100512142007-54edmcj1z6ma460c-1
------------------------------------------------------------
revno: 700
revision-id: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Mon 2010-05-10 09:38:10 -0500
message:
  with reading grades
modified:
  math214/grades_214.ods grades_214.ods-20100501235851-u7bbyio8o882k3hf-1
------------------------------------------------------------
revno: 699
revision-id: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Mon 2010-05-10 09:31:27 -0500
message:
  exam grades, hw thru 7, for posting
modified:
  math214/grades_214.ods grades_214.ods-20100501235851-u7bbyio8o882k3hf-1
------------------------------------------------------------
revno: 698 [merge]
revision-id: <email address hidden>
parent: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Mon 2010-05-10 09:24:38 -0500
message:
  merge in paper airplane grades
modified:
  math214/grades_214.ods grades_214.ods-20100501235851-u7bbyio8o882k3hf-1
    ------------------------------------------------------------
    revno: 697.1.1
    revision-id: <email address hidden>
    parent: <email address hidden>
    committer: Neil Martinsen-Burrell <email address hidden>
    branch nick: Teaching
    timestamp: Thu 2010-05-06 09:56:56 -0500
    message:
      paper airplane grades
    modified:
      math214/grades_214.ods grades_214.ods-20100501235851-u7bbyio8o882k3hf-1
------------------------------------------------------------
revno: 697
revision-id: <email address hidden>
parent: <email address hidden>
committer: Neil Martinsen-Burrell <email address hidden>
branch nick: Teaching
timestamp: Wed 2010-05-05 12:57:46 -0500
message:
  slides for the second half of class
added:
  math214/lectures/sullivan_ch3a.pdf sullivan_ch3a.pdf-20100505175733-lbn44jwegu4lzgol-1
  math214/lectures/sullivan_ch3b.pdf sullivan_ch3b.pdf-20100505175733-lbn44jwegu4lzgol-2
modified:
  math214/lectures/chapter3.tex chapter3.tex-20100505032300-ol9pkynrdjzrmz6w-1

Now, when I merge teaching-current into Teaching, I expect to get a conflict on math214/grades_214.ods:

nmb@guttle[~]$ cd Teaching
nmb@guttle[~/Teaching]$ bzr merge ../teaching-current
+N math214/lectures/chapter7a.pdf
+N math214/semester-project.tex
RM math214/grades_214.ods => math214/grades_214.ods.OTHER
Contents conflict in math214/grades_214.ods
1 conflicts encountered.

Now, though, the status seems very suspicious:

nmb@guttle[~/Teaching]$ bzr st
added:
  math214/lectures/chapter7a.pdf
  math214/semester-project.tex
renamed:
  math214/grades_214.ods => math214/grades_214.ods.OTHER
modified:
  math214/grades_214.ods.OTHER
unknown:
  math214/grades_214.ods.BASE
  math214/grades_214.ods.THIS
  math214/exam1/exam1_soln.tex
conflicts:
  Contents conflict in math214/grades_214.ods
pending merge tips: (use -v to see all merge revisions)
  Neil Martinsen-Bu... 2010-05-12 reading Qs and hw thru 9

Where the file is marked as renamed *and* modified which just seems wrong. Neither branch contained a rename at all! Now, what I would like to do is to take the version of math214/grades_214.ods from teaching-current as the correct, up-to-date version:

nmb@guttle[~/Teaching]$ cp math214/grades_214.ods.OTHER math214/grades_214.ods
nmb@guttle[~/Teaching]$ bzr st
added:
  math214/lectures/chapter7a.pdf
  math214/semester-project.tex
renamed:
  math214/grades_214.ods => math214/grades_214.ods.OTHER
modified:
  math214/grades_214.ods.OTHER
unknown:
  math214/grades_214.ods
  math214/grades_214.ods.BASE
  math214/grades_214.ods.THIS
  math214/exam1/exam1_soln.tex
conflicts:
  Contents conflict in math214/grades_214.ods
pending merge tips: (use -v to see all merge revisions)
  Neil Martinsen-Bu... 2010-05-12 reading Qs and hw thru 9

Which of course isn't right because now math214/grades_214.ods is unknown. ``bzr resolve --take-other`` also fails with a traceback (which may be a separate bug):

nmb@guttle[~/Teaching]$ rm math214/grades_214.ods
nmb@guttle[~/Teaching]$ bzr st
added:
  math214/lectures/chapter7a.pdf
  math214/semester-project.tex
renamed:
  math214/grades_214.ods => math214/grades_214.ods.OTHER
modified:
  math214/grades_214.ods.OTHER
unknown:
  math214/grades_214.ods.BASE
  math214/grades_214.ods.THIS
  math214/exam1/exam1_soln.tex
conflicts:
  Contents conflict in math214/grades_214.ods
pending merge tips: (use -v to see all merge revisions)
  Neil Martinsen-Bu... 2010-05-12 reading Qs and hw thru 9
nmb@guttle[~/Teaching]$ bzr resolve --take-other math214/grades_214.ods
bzr: ERROR: bzrlib.errors.InvalidEntryName: Invalid entry name: math214/grades_214.ods

Traceback (most recent call last):
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/commands.py", line 907, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/commands.py", line 1111, in run_bzr
    ret = run(*run_argv)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/commands.py", line 685, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/commands.py", line 700, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/conflicts.py", line 158, in run
    resolve(tree, file_list, action=action)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/conflicts.py", line 187, in resolve
    conflict._do(action, tree)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/conflicts.py", line 413, in _do
    meth(tree)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/conflicts.py", line 598, in action_take_other
    self._resolve_with_cleanups(tree, 'THIS')
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/conflicts.py", line 442, in _resolve_with_cleanups
    op.run_simple(tt, *args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/conflicts.py", line 592, in _resolve
    tt.apply()
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/transform.py", line 1527, in apply
    inventory_delta = self._generate_inventory_delta()
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/transform.py", line 1603, in _generate_inventory_delta
    parent_file_id, file_id)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/inventory.py", line 2324, in make_entry
    return factory(file_id, name, parent_id)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/inventory.py", line 537, in __init__
    super(InventoryFile, self).__init__(file_id, name, parent_id)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/inventory.py", line 216, in __init__
    raise errors.InvalidEntryName(name=name)
InvalidEntryName: Invalid entry name: math214/grades_214.ods

bzr 2.2.0dev1 on python 2.6.5 (Darwin-9.8.0-i386-32bit)
arguments: ['/Users/nmb/usr/bin/bzr', 'resolve', '--take-other', 'math214/grades_214.ods']
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
  automirror /Users/nmb/.bazaar/plugins/automirror [0.1.0]
  bzrtools /Users/nmb/.bazaar/plugins/bzrtools [2.1.0]
  colo /Users/nmb/.bazaar/plugins/colo [0.2.0dev]
  explorer /Users/nmb/.bazaar/plugins/explorer [1.1.0dev]
  fastimport /Users/nmb/.bazaar/plugins/fastimport [0.9.0dev]
  git /Users/nmb/.bazaar/plugins/git [0.5.0]
  hg /Users/nmb/.bazaar/plugins/hg [0.2.0dev]
  latex_version_info /Users/nmb/.bazaar/plugins/latex_version_info [0.0.2]
  launchpad /Users/nmb/src/bzr/bzr.dev/bzrlib/plugins/launchpad [2.2.0dev1]
  netrc_credential_store /Users/nmb/src/bzr/bzr.dev/bzrlib/plugins/netrc_credential_store [2.2.0dev1]
  news_merge /Users/nmb/src/bzr/bzr.dev/bzrlib/plugins/news_merge [2.2.0dev1]
  qbzr /Users/nmb/.bazaar/plugins/qbzr [0.19.0dev1]
  rst2html /Users/nmb/.bazaar/plugins/rst2html [0.0.2]

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

The branch contains confidential information so I can't share it, but I would be happy to provide any more debugging information that is needed.

Tags:

Martin Pool (mbp) on 2010-05-13

summary:	- Problem merging with a single conflict: rename appears out of nowhere + InvalidEntryName: Problem merging with a single conflict: rename appears + out of nowhere
Changed in bzr:
status:	New → Confirmed
importance:	Undecided → Medium

Revision history for this message

Vincent Ladeuil (vila) wrote on 2010-05-18: Re: [Bug 579733] [NEW] Problem merging with a single conflict: rename appears out of nowhere

>>>>> Neil Martinsen-Burrell <email address hidden> writes:

    > Public bug reported:
    > I have two branches, ~/Teaching and ~/teaching-current. They are
    > diverged and have both changed the same file.

Not exactly, I presume they have both *created* a file with the same
name, but each one got a different file-id (which is used by bzr to
track renames).

> Now, though, the status seems very suspicious:

    > nmb@guttle[~/Teaching]$ bzr st
    > added:
    > math214/lectures/chapter7a.pdf
    > math214/semester-project.tex
    > renamed:
    > math214/grades_214.ods => math214/grades_214.ods.OTHER

.OTHER is the file from the merged branch (see below)

    > modified:
    > math214/grades_214.ods.OTHER
    > unknown:
    > math214/grades_214.ods.BASE
    > math214/grades_214.ods.THIS
    > math214/exam1/exam1_soln.tex
    > conflicts:
    > Contents conflict in math214/grades_214.ods
    > pending merge tips: (use -v to see all merge revisions)
    > Neil Martinsen-Bu... 2010-05-12 reading Qs and hw thru 9

> Where the file is marked as renamed *and* modified which just seems
> wrong. Neither branch contained a rename at all!

Right, bzr did the 'math214/grades_214.ods =>
math214/grades_214.ods.OTHER' rename so no 'grades_214.ods' is left in
the tree until the conflict is resolved.

    > Now, what I would like to do is to take the version of
    > math214/grades_214.ods from teaching-current as the correct,
    > up-to-date version:

> nmb@guttle[~/Teaching]$ cp math214/grades_214.ods.OTHER math214/grades_214.ods

Yeah, the current 'resolve --take-other' implementation is brittle,
that's a genuine bug. You're expected to use --take-other *before*
trying manual resolution, sorry about that :-/

<snip/>

    > Which of course isn't right because now math214/grades_214.ods is
    > unknown. ``bzr resolve --take-other`` also fails with a traceback
    > (which may be a separate bug):

s/also/now/, I'm pretty sure it will succeeds if you remove grades_214.ods.

It's not a separate bug, it *is* the bug, --take=other shouldn't
backtrace, at worst it should realize that grade_214.ods is in the way
(and unknown !) and reports a clean error accordingly.

    > The branch contains confidential information so I can't share it,
    > but I would be happy to provide any more debugging information
    > that is needed.

I'm pretty confident this could be reproduced easily.

Thanks for the report !

>>>>> Neil Martinsen-Burrell <nmb@wartburg.edu> writes:

> Public bug reported:
    > I have two branches, ~/Teaching and ~/teaching-current.  They are
    > diverged and have both changed the same file.

Not exactly, I presume they have both *created* a file with the same
name, but each one got a different file-id (which is used by bzr to
track renames).

> Now, though, the status seems very suspicious:

> nmb@guttle[~/Teaching]$ bzr st
    > added:
    >   math214/lectures/chapter7a.pdf
    >   math214/semester-project.tex
    > renamed:
    >   math214/grades_214.ods => math214/grades_214.ods.OTHER

.OTHER is the file from the merged branch (see below)

> modified:
    >   math214/grades_214.ods.OTHER
    > unknown:
    >   math214/grades_214.ods.BASE
    >   math214/grades_214.ods.THIS
    >   math214/exam1/exam1_soln.tex
    > conflicts:
    >   Contents conflict in math214/grades_214.ods
    > pending merge tips: (use -v to see all merge revisions)
    >   Neil Martinsen-Bu... 2010-05-12 reading Qs and hw thru 9

> Where the file is marked as renamed *and* modified which just seems
    > wrong.  Neither branch contained a rename at all!

Right, bzr did the 'math214/grades_214.ods =>
math214/grades_214.ods.OTHER' rename so no 'grades_214.ods' is left in
the tree until the conflict is resolved.

> Now, what I would like to do is to take the version of
    > math214/grades_214.ods from teaching-current as the correct,
    > up-to-date version:

> nmb@guttle[~/Teaching]$ cp math214/grades_214.ods.OTHER math214/grades_214.ods

Yeah, the current 'resolve --take-other' implementation is brittle,
that's a genuine bug. You're expected to use --take-other *before*
trying manual resolution, sorry about that :-/

<snip/>

> Which of course isn't right because now math214/grades_214.ods is
    > unknown.  ``bzr resolve --take-other`` also fails with a traceback
    > (which may be a separate bug):

s/also/now/, I'm pretty sure it will succeeds if you remove grades_214.ods.

It's not a separate bug, it *is* the bug, --take=other shouldn't
backtrace, at worst it should realize that grade_214.ods is in the way
(and unknown !) and reports a clean error accordingly.

> The branch contains confidential information so I can't share it,
    > but I would be happy to provide any more debugging information
    > that is needed.

I'm pretty confident this could be reproduced easily.

Thanks for the report !

tags:

added: conflicts

Revision history for this message

Neil Martinsen-Burrell (nmb) wrote on 2010-05-18: Re: [Bug 579733] Re: InvalidEntryName: Problem merging with a single conflict: rename appears out of nowhere

On 2010-05-18 03:06, Vincent Ladeuil wrote:
>>>>>> Neil Martinsen-Burrell<email address hidden> writes:
>
> > Public bug reported:
> > I have two branches, ~/Teaching and ~/teaching-current. They are
> > diverged and have both changed the same file.
>
> Not exactly, I presume they have both *created* a file with the same
> name, but each one got a different file-id (which is used by bzr to
> track renames).

Why would you presume that? The log including file IDs is right there
in the bug report. Revisions
<email address hidden> in Teaching and
<email address hidden> in teaching-current
both show modifications of the same file with the same file ID. That
should be a textual conflict in that file.

> > Now, though, the status seems very suspicious:
>
> > nmb@guttle[~/Teaching]$ bzr st
> > added:
> > math214/lectures/chapter7a.pdf
> > math214/semester-project.tex
> > renamed:
> > math214/grades_214.ods => math214/grades_214.ods.OTHER
>
> .OTHER is the file from the merged branch (see below)
>
> > modified:
> > math214/grades_214.ods.OTHER
> > unknown:
> > math214/grades_214.ods.BASE
> > math214/grades_214.ods.THIS
> > math214/exam1/exam1_soln.tex
> > conflicts:
> > Contents conflict in math214/grades_214.ods
> > pending merge tips: (use -v to see all merge revisions)
> > Neil Martinsen-Bu... 2010-05-12 reading Qs and hw thru 9
>
> > Where the file is marked as renamed *and* modified which just seems
> > wrong. Neither branch contained a rename at all!
>
> Right, bzr did the 'math214/grades_214.ods =>
> math214/grades_214.ods.OTHER' rename so no 'grades_214.ods' is left in
> the tree until the conflict is resolved.

But where did this rename come from? The log shows NO SUCH ACTIVITY on
either branch. Is there a source of changes that would not be shown in
the log? Revision 697 is identical on the two branches. All of the
changes that could have produced divergence are shown in those two logs.
Which one of them introduced a rename?

>
> > Now, what I would like to do is to take the version of
> > math214/grades_214.ods from teaching-current as the correct,
> > up-to-date version:
>
> > nmb@guttle[~/Teaching]$ cp math214/grades_214.ods.OTHER
> math214/grades_214.ods
>
> Yeah, the current 'resolve --take-other' implementation is brittle,
> that's a genuine bug. You're expected to use --take-other *before*
> trying manual resolution, sorry about that :-/

I agree that --take-other has a genuine bug, but I think that the
existence of a rename in the merge is a bug as well. That's the one
that I think may be harder to track down.

On 2010-05-18 03:06, Vincent Ladeuil wrote:
>>>>>> Neil Martinsen-Burrell<nmb@wartburg.edu>  writes:
>
>      >  Public bug reported:
>      >  I have two branches, ~/Teaching and ~/teaching-current.  They are
>      >  diverged and have both changed the same file.
>
> Not exactly, I presume they have both *created* a file with the same
> name, but each one got a different file-id (which is used by bzr to
> track renames).

Why would you presume that?  The log including file IDs is right there 
in the bug report.  Revisions 
nmb@wartburg.edu-20100506211947-555zpx8ssbjyhdow in Teaching and 
nmb@wartburg.edu-20100510143127-gdyzawzkv4tcjhh1 in teaching-current 
both show modifications of the same file with the same file ID.  That 
should be a textual conflict in that file.

>      >  Now, though, the status seems very suspicious:
>
>      >  nmb@guttle[~/Teaching]$ bzr st
>      >  added:
>      >    math214/lectures/chapter7a.pdf
>      >    math214/semester-project.tex
>      >  renamed:
>      >    math214/grades_214.ods =>  math214/grades_214.ods.OTHER
>
> .OTHER is the file from the merged branch (see below)
>
>      >  modified:
>      >    math214/grades_214.ods.OTHER
>      >  unknown:
>      >    math214/grades_214.ods.BASE
>      >    math214/grades_214.ods.THIS
>      >    math214/exam1/exam1_soln.tex
>      >  conflicts:
>      >    Contents conflict in math214/grades_214.ods
>      >  pending merge tips: (use -v to see all merge revisions)
>      >    Neil Martinsen-Bu... 2010-05-12 reading Qs and hw thru 9
>
>      >  Where the file is marked as renamed *and* modified which just seems
>      >  wrong.  Neither branch contained a rename at all!
>
> Right, bzr did the 'math214/grades_214.ods =>
> math214/grades_214.ods.OTHER' rename so no 'grades_214.ods' is left in
> the tree until the conflict is resolved.

But where did this rename come from?  The log shows NO SUCH ACTIVITY on 
either branch.  Is there a source of changes that would not be shown in 
the log? Revision 697 is identical on the two branches.  All of the 
changes that could have produced divergence are shown in those two logs. 
  Which one of them introduced a rename?

>
>      >  Now, what I would like to do is to take the version of
>      >  math214/grades_214.ods from teaching-current as the correct,
>      >  up-to-date version:
>
>      >  nmb@guttle[~/Teaching]$ cp math214/grades_214.ods.OTHER
> math214/grades_214.ods
>
> Yeah, the current 'resolve --take-other' implementation is brittle,
> that's a genuine bug. You're expected to use --take-other *before*
> trying manual resolution, sorry about that :-/

I agree that --take-other has a genuine bug, but I think that the 
existence of a rename in the merge is a bug as well.  That's the one 
that I think may be harder to track down.

Revision history for this message

John A Meinel (jameinel) wrote on 2010-05-18:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

...

>> > nmb@guttle[~/Teaching]$ bzr st
>> > added:
>> > math214/lectures/chapter7a.pdf
>> > math214/semester-project.tex
>> > renamed:
>> > math214/grades_214.ods => math214/grades_214.ods.OTHER
>>
>> .OTHER is the file from the merged branch (see below)
>>
>> > modified:
>> > math214/grades_214.ods.OTHER
>> > unknown:
>> > math214/grades_214.ods.BASE
>> > math214/grades_214.ods.THIS
>> > math214/exam1/exam1_soln.tex
>> > conflicts:
>> > Contents conflict in math214/grades_214.ods
>> > pending merge tips: (use -v to see all merge revisions)
>> > Neil Martinsen-Bu... 2010-05-12 reading Qs and hw thru 9
>>
>> > Where the file is marked as renamed *and* modified which just seems
>> > wrong. Neither branch contained a rename at all!
>>
>> Right, bzr did the 'math214/grades_214.ods =>
>> math214/grades_214.ods.OTHER' rename so no 'grades_214.ods' is left in
>> the tree until the conflict is resolved.
>
> But where did this rename come from? The log shows NO SUCH ACTIVITY on
> either branch. Is there a source of changes that would not be shown in
> the log? Revision 697 is identical on the two branches. All of the
> changes that could have produced divergence are shown in those two logs.
> Which one of them introduced a rename?

If the target branch deletes a file, and the source branch modifies it,
I believe we mark it conflicted, and use a local name of 'foo.OTHER'.
The idea was to make it clear that the file had been deleted, so you had
your choice of how to resolve it.

I think the easiest way to be less confusing is to be clearer on the
"Contents conflict in..." message.

If you want to delete the contents, you should be able to:

bzr revert math214/grades_214.ods.OTHER

If you want the changes that were introduced in OTHER, then you can:

bzr rename math214/grades_214.ods.OTHER math214/grades_214.ods
bzr commit -m "Restore grades_214.ods, I didn't realize I needed it still".

or do something like:
ooodiff grades_214.ods.BASE grades_214.ods.OTHER

So that you can tell what was actually changed, and whether it matters
or not.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkvy6scACgkQJdeBCYSNAAOnPACgqOoO7hZ0ITcOJESZab7mj8+q
l7YAn0jfkvKCcDryamMioIMNocigqj8u
=6H0F
-----END PGP SIGNATURE-----

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

...

>>      >  nmb@guttle[~/Teaching]$ bzr st
>>      >  added:
>>      >    math214/lectures/chapter7a.pdf
>>      >    math214/semester-project.tex
>>      >  renamed:
>>      >    math214/grades_214.ods =>  math214/grades_214.ods.OTHER
>>
>> .OTHER is the file from the merged branch (see below)
>>
>>      >  modified:
>>      >    math214/grades_214.ods.OTHER
>>      >  unknown:
>>      >    math214/grades_214.ods.BASE
>>      >    math214/grades_214.ods.THIS
>>      >    math214/exam1/exam1_soln.tex
>>      >  conflicts:
>>      >    Contents conflict in math214/grades_214.ods
>>      >  pending merge tips: (use -v to see all merge revisions)
>>      >    Neil Martinsen-Bu... 2010-05-12 reading Qs and hw thru 9
>>
>>      >  Where the file is marked as renamed *and* modified which just seems
>>      >  wrong.  Neither branch contained a rename at all!
>>
>> Right, bzr did the 'math214/grades_214.ods =>
>> math214/grades_214.ods.OTHER' rename so no 'grades_214.ods' is left in
>> the tree until the conflict is resolved.
> 
> But where did this rename come from?  The log shows NO SUCH ACTIVITY on 
> either branch.  Is there a source of changes that would not be shown in 
> the log? Revision 697 is identical on the two branches.  All of the 
> changes that could have produced divergence are shown in those two logs. 
>   Which one of them introduced a rename?

I think the easiest way to be less confusing is to be clearer on the
"Contents conflict in..." message.

If you want to delete the contents, you should be able to:

bzr revert math214/grades_214.ods.OTHER

If you want the changes that were introduced in OTHER, then you can:

bzr rename math214/grades_214.ods.OTHER math214/grades_214.ods
 bzr commit -m "Restore grades_214.ods, I didn't realize I needed it still".

or do something like:
 ooodiff grades_214.ods.BASE grades_214.ods.OTHER

So that you can tell what was actually changed, and whether it matters
or not.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkvy6scACgkQJdeBCYSNAAOnPACgqOoO7hZ0ITcOJESZab7mj8+q
l7YAn0jfkvKCcDryamMioIMNocigqj8u
=6H0F
-----END PGP SIGNATURE-----

Revision history for this message

Neil Martinsen-Burrell (nmb) wrote on 2010-05-19:

Download full text (3.2 KiB)

On 2010-05-18 14:30 , John A Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>>> > nmb@guttle[~/Teaching]$ bzr st
>>> > added:
>>> > math214/lectures/chapter7a.pdf
>>> > math214/semester-project.tex
>>> > renamed:
>>> > math214/grades_214.ods => math214/grades_214.ods.OTHER
>>>
>>> .OTHER is the file from the merged branch (see below)
>>>
>>> > modified:
>>> > math214/grades_214.ods.OTHER
>>> > unknown:
>>> > math214/grades_214.ods.BASE
>>> > math214/grades_214.ods.THIS
>>> > math214/exam1/exam1_soln.tex
>>> > conflicts:
>>> > Contents conflict in math214/grades_214.ods
>>> > pending merge tips: (use -v to see all merge revisions)
>>> > Neil Martinsen-Bu... 2010-05-12 reading Qs and hw thru 9
>>>
>>> > Where the file is marked as renamed *and* modified which just seems
>>> > wrong. Neither branch contained a rename at all!
>>>
>>> Right, bzr did the 'math214/grades_214.ods =>
>>> math214/grades_214.ods.OTHER' rename so no 'grades_214.ods' is left in
>>> the tree until the conflict is resolved.
>>
>> But where did this rename come from? The log shows NO SUCH ACTIVITY on
>> either branch. Is there a source of changes that would not be shown in
>> the log? Revision 697 is identical on the two branches. All of the
>> changes that could have produced divergence are shown in those two logs.
>> Which one of them introduced a rename?
>
> If the target branch deletes a file, and the source branch modifies it,
> I believe we mark it conflicted, and use a local name of 'foo.OTHER'.
> The idea was to make it clear that the file had been deleted, so you had
> your choice of how to resolve it.

I agree that this is what Bazaar believes happened in this instance:
that the Teaching branch deleted this file, thus modifications present
in the teaching-current branch should be seen now in the
grades_214.ods.OTHER file. (from ``bzr help merge`` I found ``bzr help
status-flags`` which explained what was meant by "RM" in the merge
output).

The bug that I am interested in tracking down is WHY Bazaar thinks that
a deletion occurred in the Teaching branch, when no such operation is
recorded in the revisions of that branch (see log in the original bug
report). That's why the original summary of this bug was that "rename
appears out of nowhere".

> I think the easiest way to be less confusing is to be clearer on the
> "Contents conflict in..." message.
>
> If you want to delete the contents, you should be able to:
>
> bzr revert math214/grades_214.ods.OTHER
>
> If you want the changes that were introduced in OTHER, then you can:
>
> bzr rename math214/grades_214.ods.OTHER math214/grades_214.ods
> bzr commit -m "Restore grades_214.ods, I didn't realize I needed it still".

This is in fact how I did resolve the conflict once I was able to figure
out what Bazaar thought was happening.

> or do something like:
> ooodiff grades_214.ods.BASE grades_214.ods.OTHER
>
> So that you can tell what was actually changed, and whether it matters
> or not.

Yes, I was aware of what...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.