v.ladeuil+lp at free.fr
Fri Jun 12 12:56:59 BST 2009
>>>>> "Olivier" == Olivier R-D <o.r-d at laposte.net> writes:
Olivier> then he did a bzr log
Didn't you see the last line saying:
Use --include-merges or -n0 to see merged revisions.
or was that message unclear for you ?
Or may be 'bzr log' was outputting too much info and you
ctrl-C'ed it ?
Anyway, when re-syncing with the server after having issued one
or several 'commit --local', you need to merge your local
'bzr log' in its default mode, doesn't show these merged
revisions. You can still see them (once you commit after the
merge) by using 'bzr log --include-merges'.
Before committing (while they have been pushed aside as pending
merges), you can see them by doing 'bzr st' or even 'bzr st -v'.
Olivier> and, apart from his last log, all revisions where
Olivier> from last week .... The work done the last 3 days is
Olivier> not there., everything committed with --local is
Olivier> gone ....
When in doubt, avoid the temptation to guess :) Did you check that
his last modifications was still in the working files ? Did you
issue 'bzr st -v' ?
More information about the bazaar