{"thread":{"id":"26835","subject":"Update git-gui tree please?","startedAt":"2011-03-23T05:46:17Z","lastAt":"2011-03-26T21:51:37Z","messageCount":4,"participants":["Junio C Hamano","Pat Thoyts"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"164112","messageId":"7vlj06gziu.fsf@alter.siamese.dyndns.org","threadId":"26835","inReplyTo":null,"subject":"Update git-gui tree please?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-23T05:46:17Z","receivedAt":"2011-03-23T05:46:17Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"As Sebastian's addition of BeyondCompare-3 as a new backend for mergetool\nhas graduated to my 'master' branch, could you fetch from me and merge the\ntip of ss/git-gui-mergetool branch to git-gui repository, like this?\n\n\tgit fetch git://git.kernel.org/pub/scm/git/git.git next\n\tgit branch ss/git-gui-mergetool f3768a6714e667205d68475\n git merge ss/git-gui-mergetool\n\nAlso I'll hopefully tagging 1.7.5-rc0 by the end of the month or the\nmiddle of April at the latest, so please start planning to wrap up the\nenhancements and fixes meant for the next release and throw me a pull\nrequest when your tree is in a good shape to do so. I realize that I am\nalready behind your tip 4c2519e (git-gui: fetch/prune all entry appears\nlast, 2011-02-22), but I'll wait until I hear from you.\n\nThanks.\n"},{"id":"164358","messageId":"87hbaqqhvr.fsf@fox.patthoyts.tk","threadId":"26835","inReplyTo":"7vlj06gziu.fsf@alter.siamese.dyndns.org","subject":"Re: Update git-gui tree please?","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2011-03-26T10:46:16Z","receivedAt":"2011-03-26T10:46:16Z","isPatch":false,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Junio C Hamano writes:\n\n>As Sebastian's addition of BeyondCompare-3 as a new backend for mergetool\n>has graduated to my 'master' branch, could you fetch from me and merge the\n>tip of ss/git-gui-mergetool branch to git-gui repository, like this?\n>\n>\tgit fetch git://git.kernel.org/pub/scm/git/git.git next\n>\tgit branch ss/git-gui-mergetool f3768a6714e667205d68475\n> git merge ss/git-gui-mergetool\n>\n>Also I'll hopefully tagging 1.7.5-rc0 by the end of the month or the\n>middle of April at the latest, so please start planning to wrap up the\n>enhancements and fixes meant for the next release and throw me a pull\n>request when your tree is in a good shape to do so. I realize that I am\n>already behind your tip 4c2519e (git-gui: fetch/prune all entry appears\n>last, 2011-02-22), but I'll wait until I hear from you.\n>\n>Thanks.\n\nI have merged your ss/git-gui-mergetool branch in and tagged it so\nplease pull:\n\nThe following changes since commit 8f85599aba6b569de5c559994704a416f52bc031:\n\n git-gui: apply color information from git diff output (2010-10-27 23:47:28 +0100)\n\nare available in the git repository at:\n git://repo.or.cz/git-gui.git maint\n\nAlex Riesen (2):\n git-gui: update russian translation\n git-gui: update russian translation\n\nAlexandre Erwin Ittner (1):\n git-gui: add Brazilian Portuguese (pt-BR) translation\n\nBert Wesarg (16):\n git-gui: fix ANSI-color parsing\n git-gui: respect conflict marker size\n git-gui: fix browsers [Up To Parent] in sub-sub-directories.\n git-gui: Fix use of renamed tag.\n git-gui: Fix use of hunk tag for non-hunk content.\n git-gui: fix typo in image data\n git-gui: remove 'no such variable' for s error when encounter unknown file states\n git-gui: learn more type change states\n git-gui: rework handling of diff header\n git-gui: handle index lines only in the diff header\n git-gui: name also new symlinks so\n git-gui: there is no \"mode *\" diff header line\n git-gui: move 3way diff autodetect up\n git-gui: always reset the current tag\n git-gui: handle special content lines only in the diff header section\n git-gui: handle meta diff header lines only in the header section\n\nHeiko Voigt (9):\n git gui: keep selected branch when remote is changed in push dialog\n git-gui: scroll down to default selection for push dialog\n git-gui: instead of defaulting to home directory use working directory\n git-gui: fix deleting item from all_remotes variable\n git-gui: always default to the last merged branch in remote delete\n git-gui: refactor remote submenu creation into subroutine\n git-gui: teach fetch/prune menu to do it for all remotes\n git-gui: fetch/prune all entry only for more than one entry\n git-gui: fetch/prune all entry appears last\n\nPat Thoyts (3):\n git-gui: Include version check and test for tearoff menu entry\n git-gui: detect the use of MUI langauge packs on Windows\n Merge branch 'ss/git-gui-mergetool'\n\nSebastian Schuberth (2):\n mergetool--lib: Sort tools alphabetically for easier lookup\n mergetool--lib: Add Beyond Compare 3 as a tool\n\nSerge Ziryukin (1):\n git-gui: fix russian translation typos\n\nSkip (1):\n git-gui: spelling fixes in russian translation\n\nStefan Naewe (1):\n git-gui: use --exclude-standard to check for untracked files\n\n git-gui.sh | 61 +-\n lib/browser.tcl | 2 +-\n lib/choose_repository.tcl | 14 +-\n lib/commit.tcl | 9 +-\n lib/diff.tcl | 115 ++-\n lib/index.tcl | 10 +-\n lib/merge.tcl | 2 +\n lib/mergetool.tcl | 101 +-\n lib/remote.tcl | 91 ++-\n lib/remote_branch_delete.tcl | 9 +-\n lib/transport.tcl | 34 +-\n po/glossary/pt_br.po | 169 +++\n po/pt_br.po | 2568 ++++++++++++++++++++++++++++++++++++++++++\n po/ru.po | 623 ++++++-----\n 14 files changed, 3371 insertions(+), 437 deletions(-)\n create mode 100644 po/glossary/pt_br.po\n create mode 100644 po/pt_br.po\n"},{"id":"164370","messageId":"7vaagh4vu6.fsf@alter.siamese.dyndns.org","threadId":"26835","inReplyTo":"87hbaqqhvr.fsf@fox.patthoyts.tk","subject":"Re: Update git-gui tree please?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-26T17:48:01Z","receivedAt":"2011-03-26T17:48:01Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pat Thoyts writes:\n\n> I have merged your ss/git-gui-mergetool branch in and tagged it so\n> please pull:\n>\n> The following changes since commit 8f85599aba6b569de5c559994704a416f52bc031:\n>\n> git-gui: apply color information from git diff output (2010-10-27 23:47:28 +0100)\n>\n> are available in the git repository at:\n> git://repo.or.cz/git-gui.git maint\n\nThanks, pulled.\n\nAre there notable changes since 1.7.4 that you want to see in the\nrelease note for upcoming 1.7.5? Aside from Russian and Bortoguese l10n,\nmost of the changes seem to be fixes or internal refactoring, but if you\nhave end-user facing changes that should be advertised, the release note\nis the place to do so.\n\nOtherwise, I can just throw in a single liner\n\n * Various git-gui updates (0.14.0)\n\nThanks.\n"},{"id":"164381","messageId":"87lj01k0t2.fsf@fox.patthoyts.tk","threadId":"26835","inReplyTo":"7vaagh4vu6.fsf@alter.siamese.dyndns.org","subject":"Re: Update git-gui tree please?","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2011-03-26T21:51:37Z","receivedAt":"2011-03-26T21:51:37Z","isPatch":false,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Junio C Hamano writes:\n\n>Pat Thoyts writes:\n>\n>> I have merged your ss/git-gui-mergetool branch in and tagged it so\n>> please pull:\n>>\n>> The following changes since commit 8f85599aba6b569de5c559994704a416f52bc031:\n>>\n>> git-gui: apply color information from git diff output (2010-10-27 23:47:28 +0100)\n>>\n>> are available in the git repository at:\n>> git://repo.or.cz/git-gui.git maint\n>\n>Thanks, pulled.\n>\n>Are there notable changes since 1.7.4 that you want to see in the\n>release note for upcoming 1.7.5? Aside from Russian and Bortoguese l10n,\n>most of the changes seem to be fixes or internal refactoring, but if you\n>have end-user facing changes that should be advertised, the release note\n>is the place to do so.\n>\n>Otherwise, I can just throw in a single liner\n>\n> * Various git-gui updates (0.14.0)\n>\n>Thanks.\n>\n\nA one liner will be fine - its all incremental fixes.\n\nThank you.\n-- \nPat Thoyts http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD\n"}]}