On 08/25/2011 10:10 PM, Brian de Alwis wrote:
> Could a workaround be to instead report the previous tip?
>
> All changes applied successfully.
> Was on revision 17562.
> Now on revision 17563.
>
> (Perhaps even better would be something like:
>
> Changed from revision 17562..17563.
>
> for easier copying and pasting, though I don't it would work nicely with
> foreign revnos.)
>
> === modified file 'bzrlib/branch.py'
> --- bzrlib/branch.py 2011-08-19 22:34:02 +0000
> +++ bzrlib/branch.py 2011-08-25 20:06:15 +0000
> @@ -3063,7 +3063,8 @@
> if self.old_revid == self.new_revid:
> to_file.write('No revisions to pull.\n')
> else:
> - to_file.write('Now on revision %d.\n' % self.new_revno)
> + to_file.write('Was on revision %d.\nNow on revision %d.\n' %
> + (self.old_revno, self.new_revno))
> self._show_tag_conficts(to_file)
>
Yeah, that makes sense. I don't think it really needs two lines though.
Perhaps "Now on revision 17563 (was: 17562).".
It might be confusing if the user tries to see what has changed by
running "bzr log-r17562..17563". That won't necessarily display the
right changes.
On 08/25/2011 10:10 PM, Brian de Alwis wrote: tag_conficts( to_file)
> Could a workaround be to instead report the previous tip?
>
> All changes applied successfully.
> Was on revision 17562.
> Now on revision 17563.
>
> (Perhaps even better would be something like:
>
> Changed from revision 17562..17563.
>
> for easier copying and pasting, though I don't it would work nicely with
> foreign revnos.)
>
> === modified file 'bzrlib/branch.py'
> --- bzrlib/branch.py 2011-08-19 22:34:02 +0000
> +++ bzrlib/branch.py 2011-08-25 20:06:15 +0000
> @@ -3063,7 +3063,8 @@
> if self.old_revid == self.new_revid:
> to_file.write('No revisions to pull.\n')
> else:
> - to_file.write('Now on revision %d.\n' % self.new_revno)
> + to_file.write('Was on revision %d.\nNow on revision %d.\n' %
> + (self.old_revno, self.new_revno))
> self._show_
>
Yeah, that makes sense. I don't think it really needs two lines though.
Perhaps "Now on revision 17563 (was: 17562).".
It might be confusing if the user tries to see what has changed by
running "bzr log-r17562..17563". That won't necessarily display the
right changes.
Cheers,
Jelmer