head 1.3; access; symbols pkgsrc-2015Q4:1.2.0.66 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.64 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.62 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.60 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.58 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.56 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.54 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.52 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.50 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.48 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.46 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.44 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.42 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.40 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.38 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.36 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.34 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.32 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.30 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.28 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.26 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.24 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.22 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.20 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.18 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.16 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.14 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.12 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.10 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.8 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.6 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.4 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.2 pkgsrc-2008Q1:1.1.0.2 pkgsrc-2008Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2016.03.18.23.13.26; author sevan; state dead; branches; next 1.2; commitid cTgGHVg7pfZnabZy; 1.2 date 2008.04.10.12.11.34; author bjs; state Exp; branches; next 1.1; 1.1 date 2008.01.30.23.03.51; author bjs; state Exp; branches; next ; desc @@ 1.3 log @ Update to 0.17.1 Submitted by Terin Stock terinjokes AT gmail com Closes PR pkg/50875 Reviewed by wiz@@ 2013-08-30: StGit-0.17.1 released Fix dirty index errors when resolving conflicts. Test suite improvements. Print tracebacks to stderr. Run test suite in parallel. Fix --authdate date parsing. @ text @$NetBSD: patch-ab,v 1.2 2008/04/10 12:11:34 bjs Exp $ --- setup.py.orig 2008-03-24 15:21:30.000000000 -0400 +++ setup.py @@@@ -62,10 +62,8 @@@@ setup(name = 'stgit', scripts = ['stg'], packages = ['stgit', 'stgit.commands'], data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')), - ('share/stgit/examples', glob.glob('examples/*.tmpl')), - ('share/stgit/examples', ['examples/gitconfig']), - ('share/stgit/contrib', ['contrib/diffcol.sh', - 'contrib/stgbashprompt.sh', + ('share/examples/stgit', ['examples/gitconfig']), + ('share/stgit/contrib', ['contrib/stgbashprompt.sh', 'contrib/stgit-completion.bash']), ('share/doc/stgit', glob.glob('doc/*.txt'))] ) @ 1.2 log @ Update to version 0.14.2. Changes since last snapshot: fix: stg mail crashes when there is no patch description Better "stg rebase" help text Enhance rebase help string by providing guidance on merge conflict resolution during a rebase. Based on text suggested by Catalin Marinas. Test the 'stg rename' command Simple rename of top-most patch Allow renaming of the top-most patch just by calling stg rename , instead of stg rename . This is for example helpful for those people who always have a typo or two in their patch names. Make documentation less confusing It's not just by default "stg new" doesn't do a refresh -- it never does. replace "git repo-config" usage by "git config" Remove a newline from the e-mail template Allow picking of one commit id Remove the reordering side-effect of the latter sync changes Fix sync to push the popped patches back after sync'ing Add a boundary to parse_patches in pick.py Refuse to send empty patches Set umask to 0022 during the setup.py execution This allows template files to be installed with the proper rights. Modify 'series' to use '#' instead of '|' Allow the synchronisation of the unapplied patches Check for unnecessary push/pop in 'float' Allow pick to import multiple patches This patch allows multiple patches on the "pick" command line. Don't set the default authdate if none specified This way, we allow a patch editing to remove an existing date by not specifying it. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2008/01/30 23:03:51 bjs Exp $ @ 1.1 log @ Update to 20080128 snapshot. Quite a few bugs have been fixed since the 0.14.1 release (which I found to have some annoying bugs/quirks myself, anyway). The ChangeLog is extensive, so check it out for a full list--some important changes follow below. While here, install the provided contrib helper scripts. The bash dependency is OK, as git depends on it anyway. In that spirit, add a dependency on devel/stgit-base, as this is useless without it. Also, install examples in share/examples/stgit as per convention. Refactor --diff-opts handling Lots of commands take a -O/--diff-opts flag, and they all handle it identically. So break that out into a library function. Don't keep old committer when rewriting a commit replace "git repo-config" usage by "git config" This is necessary since "git repo-config" will be removed soon. Fix "stg edit --sign" It worked in 0.14, but was broken some time after the release. Make "stg goto" subdirectory safe This is not specific to "stg goto" -- it affects all commands that use the new infrastructure. (But of those, only goto and coalesce were subdirectory unsafe.) Make "stg commit" fancier Allow the user to commit any patch. Changed behavior: with no parameters, commit one applied patch, not all applied patches -- this is what uncommit does. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- setup.py.orig 2007-12-19 18:15:14.000000000 -0500 d5 1 a5 1 @@@@ -59,10 +59,8 @@@@ setup(name = 'stgit', d7 1 a7 1 packages = ['stgit', 'stgit.commands', 'stgit.lib'], @