| bignose | I've accidentally done ‘bzr pull . -r revid:blah’ on the wrong branch | 02:29 |
|---|---|---|
| bignose | and now I want this branch to be back to where it was | 02:29 |
| bob2 | do you know where it was | 02:29 |
| bignose | I know the revid I need to get back to, but when I pull to that it just says “No revisions or tags to pull.” | 02:30 |
| bignose | but the history is still for the wrong branch. | 02:30 |
| bob2 | can you just reclone | 02:31 |
| bignose | I don't know, will that not destroy things like shelves? | 02:31 |
| bignose | I'd prefer to do it with ‘pull’ since that seems the right operation for fixing this non-destructively | 02:31 |
| bignose | so, ‘pull’ both pulled in the revision, and switched the history of this branch. | 02:33 |
| lifeless | bignose: bzr pull -r xxx --overwrite | 02:33 |
| bignose | now attempting to ‘pull’ it already has the revision it needs, but refuses to change the history this time. | 02:33 |
| lifeless | pull won't do anything if you are pulling a successor | 02:33 |
| lifeless | sorry, a predecessor | 02:34 |
| lifeless | unless you tell it you mean it | 02:34 |
| bignose | bizarre. now I'm getting “Unable to obtain lock filtered-46882576:///~benf/Projects/bnv/cam/trac-380_setup-supertues-2012-09/.bzr/branch/lock” | 02:35 |
| bignose | and every time I break the lock, then ‘bzr pull …’ again, it complains about the lock again. | 02:35 |
| lifeless | is the branch bound ? | 02:36 |
| bignose | yes | 02:36 |
| lifeless | so pull is locking both the master and the slave | 02:36 |
| bob2 | bound:| | 02:37 |
| bignose | and ‘break-lock’ is different? | 02:37 |
| lifeless | there are two possible things here, IIRC break-lock only checks the specific branch | 02:37 |
| lifeless | so you may need to break-lock both branches | 02:37 |
| bignose | the thing is, it appears to be a new lock each time | 02:38 |
| bignose | “locked 2 seconds ago” every time | 02:38 |
| bignose | i.e. the lock is occurring within the execution of ‘bzr pull …’, but then it's complaining about it before it completes. | 02:38 |
| lifeless | can you pastebin, bzr info -v, the exact command you're running to do the pull, and the contents of .bzr/branch/branch.conf somewhere? | 02:39 |
| bignose | shall do, thanks | 02:39 |
| bignose | lifeless: <URL:http://dpaste.org/ZNWIt/> | 02:41 |
| lifeless | ok, its possible that you have found a bug (well, clearly its a bug that this doesn't work, but you know what I mean) | 02:42 |
| lifeless | I suggest: | 02:42 |
| lifeless | bzr unbind | 02:42 |
| lifeless | do the pull | 02:42 |
| lifeless | do a bzr push --overwrite <full url here>/trac-380_setup-supertues-2012-09 | 02:43 |
| lifeless | then bzr bind | 02:43 |
| lifeless | which should get you past the situation | 02:43 |
| lifeless | and then file a bug describing it, the version of bzr, and include the contents from that pastebin | 02:43 |
| bignose | lifeless: thank you. | 02:45 |
| bignose | (using ‘bzr bind’ before ‘bzr push --overwrite’ worked, and meant I didn't need to specify the remote location.) | 02:45 |
| lifeless | np | 02:48 |
| bignose | :-( still won't let me file a bug without making a new Launchpad identity | 02:51 |
| lifeless | in your case I believe that that is 'a' Launchpad identity | 02:51 |
| bignose | so I'll have to leave that to someone with an account there. | 02:51 |
| bignose | $ bzr version | 02:53 |
| bignose | Bazaar (bzr) 2.6.0dev2 | 02:53 |
| bignose | on Debian Wheezy. | 02:53 |
| lifeless | thanks | 02:54 |
| bignose | thank you all! | 03:09 |
| vila | jelmer: ping, can you look at bzr.dev revno 6207.3.2 (merged in revno 6214) and explain me why you changed bzrlib/tests/__init__.py there ? | 07:40 |
| vila | jelmer: I found that while investigating an almost unrelated issue and couldn't understand the comment about http://pad.lv/825027 | 07:41 |
| ubot5 | Launchpad bug 825027 in Bazaar "create_safety_net is brittle" [High,Fix released] | 07:41 |
| mgz | morning! | 08:06 |
| vila | morning mgz | 08:10 |
| mgz | how are you vila? | 08:11 |
| vila | fine :) | 08:11 |
| vila | found another weird merge circa revno 6214, see my last mp | 08:11 |
| === yofel_ is now known as yofel | ||
| === slank` is now known as slank | ||
| === zyga is now known as zyga-afk | ||
| === deryck is now known as deryck[lunch] | ||
| === deryck[lunch] is now known as deryck | ||
| === glyph_ is now known as glyph | ||
| mgrandi | why would libsvn.dylib not be loaded? or missing? | 19:18 |
| mgrandi | do i need to reinstall svn or something? | 19:18 |
| jimis | hi all, I work on light checkout of a tree-less repo. To rename a branch on that repo can I just rename the directory? | 23:37 |
| jimis | What about the checkout dir, will it understand the change? | 23:38 |
| fullermd_ | mv'ing the branch by itself is fine. You'll have to update things that point to it to the new location. | 23:49 |
| fullermd_ | Checkouts would be one such thing. Saved locations (push, pull, etc) in other branches referring to it would be another. | 23:49 |
| === fullermd_ is now known as fullermd | ||
| jimis | thanks fullermd, I'll try it | 23:57 |
| jimis | how do I update a checkout? | 23:57 |
| mnn | mgz: if you're here, have you looked into InterTree.iter_changes(), why it does kind = (None, None) in some cases? | 23:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!