bugmonotone - Bugs: bug #13597, monotone update -b newbranch...

 
 

You are not allowed to post comments on this tracker with your current authentication level.

bug #13597: monotone update -b newbranch exhibits incorrect behaviour

Submitter:  None
Submitted:  Fri 01 Jul 2005 01:33:48 PM UTC
   
 
Category:  working copy Severity:  3 - Normal
Item Group:  incorrect behavior Status:  Fixed
Privacy:  Public Assigned to:  stephen_leake
Open/Closed:  Closed
mtn version --full: 

monotone 0.19 (base revision: 168adf9537ff136c9b7fe7faad5991f92859390d)
Running on: Linux 2.4.27-2-686 #1 Mon May 16 17:03:22 JST 2005 i686
Changes since base revision:

new_manifest [52a617d908ac6c4bb5b837ce5306f75155dc59ef]

old_revision [168adf9537ff136c9b7fe7faad5991f92859390d]
old_manifest [a9ee1d741b855fdcc0d038d64d913cef70da72f5]

patch "po/monotone.pot"
 from [10e6d7cbad87eaa0dbe35c803cafa371567f024b]
   to [0465f6ac8d09fac5938ac067747b179aca677b67]


  Generated from data cached in the distribution;
  further changes may have been made.

  Generated from data cached in the distribution;
  further changes may have been made.

  Generated from data cached in the distribution;
  further changes may have been made.

Sun 09 May 2010 10:13:25 PM UTC, comment #5: 

I believe I had a mtn automate stdio session open on the same workspace, and I was using it in the middle of the command line sequence, and it was resetting _MTN/options (which is a related, but different, problem).

tests/update_-b_foo_updates__MTN_options_correctly confirms mtn is correct now.

So we can close this.

Stephen Leake <stephen_leake>
Group Member
Sun 09 May 2010 09:56:56 PM UTC, comment #4: 

Hrm... whats the actual issue here? If I switch the branch from A to B with commit -b B, _MTN/options properly contains B as branch after the commit. Is this maybe some weird local problem, Stephen, or do I get something wrong?

Thomas Keller <tommyd>
Group administrator
Sun 09 May 2010 02:02:26 PM UTC, comment #3: 

continuing the same sequence:

Stephe Leake@sabul$ mtn update -r h:net.venge.monotone.bugfest-2010.13597-stephen_leake
mtn: expanding selection 'h:net.venge.monotone.bugfest-2010.13603-stephen_leake'
mtn: expanded to 'd5a902ef458eb1a170dc18ad4b34adf054bf7f09'
mtn: already up to date at d5a902ef458eb1a170dc18ad4b34adf054bf7f09
Stephe Leake@sabul$ grep branch _MTN/options
  branch "net.venge.monotone.bugfest-2010.13597-stephen_leake"

should have given a message "switching to branch ..."

Stephen Leake <stephen_leake>
Group Member
Sun 09 May 2010 01:55:31 PM UTC, comment #2: 

I take it back. Consider this sequence:

Stephe Leake@sabul$ mtn commit --branch net.venge.monotone.bugfest-2010.13597-stephen_leake
mtn: beginning commit on branch 'net.venge.monotone.bugfest-2010.13597-stephen_leake'
mtn: committed revision 87c0289bd4b9144902aa0400cb1b4c40bf68ae69
Stephe Leake@sabul$ mtn update --branch net.venge.monotone.bugfest-2010.13597-stephen_leake
mtn: updating along branch 'net.venge.monotone.bugfest-2010.13597-stephen_leake'
mtn: already up to date at 87c0289bd4b9144902aa0400cb1b4c40bf68ae69
Stephe Leake@sabul$ mtn status
Current revision: 1f607003116d49011d643af9b264a49426632028
Current branch: net.venge.monotone.bugfest-2010.13597-stephen_leake
Changes against parent 87c0289bd4b9144902aa0400cb1b4c40bf68ae69
  no changes
Stephe Leake@sabul$ grep branch _MTN/options
  branch "net.venge.monotone"


I have no idea what the next commit will do!

Stephen Leake <stephen_leake>
Group Member
Sun 09 May 2010 11:10:25 AM UTC, comment #1: 

Fixed in current mtn; see the various tests/update*

Stephen Leake <stephen_leake>
Group Member
Fri 01 Jul 2005 01:33:48 PM UTC, original submission:  

Switching between two branches with "monotone update -b newbranch" does not update to the head of the new branch and leaves the working directory in a weird state where a simple "monotone update" no longer takes you to the head of the current branch.

See the log below for an example:

rwhitby@linux:/home/slug/openembedded$ mt heads
monotone: branch 'org.openembedded.dev' is currently merged:
40ab23b1b8e8e478cc075a3795e981566f038498 -email is unavailable- 2005-07-01T07:39:55
rwhitby@linux:/home/slug/openembedded$ monotone -b org.openembedded.nslu2-linux update
monotone: selected update target a03f0834b5caae5065d7445ef3fed2c8700023a8
...
monotone: updated to base revision a03f0834b5caae5065d7445ef3fed2c8700023a8
rwhitby@linux:/home/slug/openembedded$ mt heads
monotone: branch 'org.openembedded.nslu2-linux' is currently merged:
a03f0834b5caae5065d7445ef3fed2c8700023a8 -email is unavailable- 2005-07-01T07:46:49
rwhitby@linux:/home/slug/openembedded$ monotone -b org.openembedded.dev update
monotone: already up to date at a03f0834b5caae5065d7445ef3fed2c8700023a8
rwhitby@linux:/home/slug/openembedded$ mt heads
monotone: branch 'org.openembedded.dev' is currently merged:
40ab23b1b8e8e478cc075a3795e981566f038498 -email is unavailable- 2005-07-01T07:39:55
rwhitby@linux:/home/slug/openembedded$ monotone -b org.openembedded.dev update 40ab23b1b8e8e478cc075a3795e981566f038498
monotone: selected update target 40ab23b1b8e8e478cc075a3795e981566f038498
...
monotone: updated to base revision 40ab23b1b8e8e478cc075a3795e981566f038498
rwhitby@linux:/home/slug/openembedded$ monotone -b org.openembedded.nslu2-linux update
monotone: selected update target a03f0834b5caae5065d7445ef3fed2c8700023a8
...
monotone: updated to base revision a03f0834b5caae5065d7445ef3fed2c8700023a8
rwhitby@linux:/home/slug/openembedded$ mt heads
monotone: branch 'org.openembedded.nslu2-linux' is currently merged:
a03f0834b5caae5065d7445ef3fed2c8700023a8 -email is unavailable- 2005-07-01T07:46:49
rwhitby@linux:/home/slug/openembedded$ monotone -b org.openembedded.nslu2-linux update
monotone: already up to date at a03f0834b5caae5065d7445ef3fed2c8700023a8
rwhitby@linux:/home/slug/openembedded$ monotone -b org.openembedded.dev update
monotone: already up to date at a03f0834b5caae5065d7445ef3fed2c8700023a8
rwhitby@linux:/home/slug/openembedded$ mt heads
monotone: branch 'org.openembedded.dev' is currently merged:
40ab23b1b8e8e478cc075a3795e981566f038498 -email is unavailable- 2005-07-01T07:39:55
rwhitby@linux:/home/slug/openembedded$ mt update
monotone: already up to date at a03f0834b5caae5065d7445ef3fed2c8700023a8
rwhitby@linux:/home/slug/openembedded$ mt update 40ab23b1b8e8e478cc075a3795e981566f038498
monotone: selected update target 40ab23b1b8e8e478cc075a3795e981566f038498
...
monotone: updated to base revision 40ab23b1b8e8e478cc075a3795e981566f038498
rwhitby@linux:/home/slug/openembedded$ mt update
monotone: already up to date at 40ab23b1b8e8e478cc075a3795e981566f038498

Anonymous

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -email is unavailable- added by tommyd (Posted a comment)
  • -email is unavailable- added by stephen_leake (Updated the item)
  •  

    There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

     

    Follow 8 latest changes.

    Date Changed by Updated Field Previous Value => Replaced by
    2010-05-10 stephen_leake Open/ClosedIn Test Closed
    2010-05-09 stephen_leake StatusNone Fixed
        Open/ClosedOpen In Test
    2010-05-09 stephen_leake StatusFixed None
        Open/ClosedIn Test Open
    2010-05-09 stephen_leake StatusNone Fixed
        Open/ClosedOpen In Test
    2010-05-08 stephen_leake Assigned toNone stephen_leake

    Back to the top

    Powered by Savane 3.13-02a9.
    Corresponding source code