InvalidWorkingTree when using lightweight co
Bug #1248569 reported by
Chris Johnston
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:/
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
lp:~dobey/tarmac/fix-wt-check
- Chris Johnston: Approve
- Francis Ginther: Approve
-
Diff: 51 lines (+18/-6)2 files modifiedtarmac/branch.py (+2/-4)
tarmac/tests/test_branch.py (+16/-2)
summary: |
- Problems with merging + InvalidWorkingTree when using lightweight co |
Changed in tarmac: | |
status: | New → Triaged |
importance: | Undecided → Critical |
assignee: | nobody → Rodney Dawes (dobey) |
Changed in tarmac: | |
status: | Triaged → Fix Committed |
Changed in tarmac: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
Can you run merge with the --debug option, and include the line from the log beginning "Tree URLs do not match:" as well?