Comment 3 for bug 783296
Revision history for this message
| IWATA Hidetaka (hid-iwata) wrote Re: shelve : Failed to unshelve changes which was made by partial hunk shelving. | #3 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
bbfa235
(Get the code!)
I agree with you that unshelve should make conflict in this case.
The result of steps you said is:
Line 01 |A
Line 02 |<<<<<<< TREE
Line 03 |x
Line 04 |C
Line 05 |=======
Line 06 |B
Line 07 |y
Line 08 |>>>>>>> MERGE-SOURCE
Line 09 |D
I think this is natural result, but in this case, the result is more strange.
One more case.
If I revert this file after shelve, and then unshelve, unshelve says 'All change applied successfully'.
And result is:
Line 01 |A
Line 02 |<<<<<<<
Line 03 |B
Line 04 |C
Line 05 |=======
Line 06 |x
Line 07 |y
Line 08 |>>>>>>>
Line 09 |D