http://bugs.grommit.com/show_bug.cgi?id=634
------- Comment #4 from roland.mainz at nrubsig.org 2009-09-15 18:54 PDT
-------
The prototype022 branch has been created like this:
$ svn mkdir -m 'Adding subdir for prototype022 work'
svn://svn.genunix.org/on/branches/ksh93/gisburn/prototype022
Committed revision 1693.
$ svn cp -m 'Creating branch of OS/Net build 122 for ksh93-integration
prototype022' svn://svn.genunix.org/on/tags/b122/usr
svn://svn.genunix.org/on/branches/ksh93/gisburn/prototype022/
Committed revision 1694.
# create diff which includes removed files
$ mkdir diff ; cd diff
$ (mkdir svnexport_old ; cd svnexport_old ; svn export
svn://svn.genunix.org/on/tags/b111/usr/src)
$ (mkdir svnexport_new ; cd svnexport_new ; svn export -r 1694
svn://svn.genunix.org/on/branches/ksh93/gisburn/prototype021/usr/src)
$ gdiff -r -u -N svnexport_old/src svnexport_new/src | sed
's/svnexport_new\///g;s/svnexport_old\///g'
>svn_genunix_org_on_branches_ksh93_gisburn_prototype021_rev_b111_1694.diff.txt
$ cp
svn_genunix_org_on_branches_ksh93_gisburn_prototype021_rev_b111_1694.diff.txt
../xxx.diff
$ cd ..
$ timex svn checkout
svn://svn.genunix.org/on/branches/ksh93/gisburn/prototype022
$ cd prototype022/usr
# generate list of files which get patched
$ cat ../../xxx.diff | egrep "^\+\+\+ " | awk "{ print \$2 }"
>patched_files.txt
# create list of dirs which get patched
cat patched_files.txt | while read i ; do dirname "$i" ; done | sort -u
>patched_dirs.txt
# create dirs and add them to subversion
cat patched_dirs.txt | while read i ; do print "## $i" ; mkdir -p "$i" ; done
(cat patched_dirs.txt | while read i ; do print "## $i" ; svn add "$i" ; done)
2>&1 | tee -a svnadddirslog.txt
# check log for problems
cat svnadddirslog.txt | egrep -v "svn: .* is already under version control"
# apply the patch
gpatch -p0 <../../xxx.diff >patch.log
# check for rejected patch hunks
# fix rejects by hand
# add/remove patched files to subversion
$ (cat patched_files.txt | while read i ; do print "## $i" ; if [[ -s "$i" ]] ;
then svn add "$i" ; else svn remove --force "$i" ; fi ; done) 2>&1 | tee -a
svnfileadd.log
# verify that the "svn add"/"svn remove" worked properly
$ cat svnfileadd.log | egrep -v "## usr/|is already under version control" |
less
# add binariy files in src/lib/libshell/misc/
$ cd src/lib/libshell/misc/
$ svn export
http://svn.genunix.org/repos/on/branches/ksh93/gisburn/prototype021/usr/src/lib/libshell/misc/images
Exported revision 1694.
$ svn add images
# commit changes:
$ cat commitmessage.txt
Patch for bug #634 (http://bugs.grommit.com/show_bug.cgi?id=634 - 'RFE: We
need a B122-based "prototype021" branch')
The patch applies the prototype021 changes to the B122-based prototype022
branch.
Patch URL is http://bugs.grommit.com/attachment.cgi?id=337
$ svn commit --file=commitmessage.txt
[snip]
Transmitting file data
..............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
.....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
Committed revision 1695.
Leaving bug open until the verfication builds are complete...
--
Configure bugmail: http://bugs.grommit.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
