Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.1, 1.9.2, and 1.9.3

sync: improve descriptions of rebase and fetch post-pull options

Changeset 09a2fb549eab…

Parent c31c5c69803a…

by Steve Borho

Changes to one file · Browse files at 09a2fb549eab Showing diff from parent c31c5c69803a Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
730
731
732
733
 
734
735
736
 
739
740
741
742
 
743
744
745
 
730
731
732
 
733
734
735
736
 
739
740
741
 
742
743
744
745
@@ -730,7 +730,7 @@
    if 'fetch' in repo.extensions() or repo.postpull == 'fetch':   if 'fetch' in repo.extensions(): - btntxt = _('Fetch - use fetch extension') + btntxt = _('Fetch - use fetch (auto merge pulled changes)')   else:   btntxt = _('Fetch - use fetch extension (fetch is not active!)')   self.fetch = QRadioButton(btntxt) @@ -739,7 +739,7 @@
  self.fetch = None   if 'rebase' in repo.extensions() or repo.postpull == 'rebase':   if 'rebase' in repo.extensions(): - btntxt = _('Rebase - use rebase extension') + btntxt = _('Rebase - rebase local commits above pulled changes')   else:   btntxt = _('Rebase - use rebase extension (rebase is not active!)')   self.rebase = QRadioButton(btntxt)