InvalidWorkingTree when using lightweight co

Bug #1248569 reported by Chris Johnston
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Tarmac
Fix Released
Critical
dobey

Bug Description

After some of the recent changes to tarmac, I'm having problems with merging. If I do a lightweight checkout of lp:summit, I get the error:

2013-11-06 14:30:16 WARNING Merging https://code.launchpad.net/~mhall119/summit/change-irclog-urls-1226818 into https://code.launchpad.net/~summit-hackers/summit/trunk failed: The `tree_dir` option for the target branch is not a lightweight checkout. Please ask a project administrator to resolve the issue, and try again.

If I rm -rf summit/ and then run tarmac, it will do a checkout and I will get one merge. After that first merge, I will start getting an error like the one above.

Related branches

dobey (dobey)
summary: - Problems with merging
+ InvalidWorkingTree when using lightweight co
Changed in tarmac:
status: New → Triaged
importance: Undecided → Critical
assignee: nobody → Rodney Dawes (dobey)
Revision history for this message
dobey (dobey) wrote :

Can you run merge with the --debug option, and include the line from the log beginning "Tree URLs do not match:" as well?

Changed in tarmac:
status: Triaged → Fix Committed
dobey (dobey)
Changed in tarmac:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

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