Re: [nmap-svn] r33103 - in nmap-exp/devin/lpeg-integration: . libpcre

[Jacek Wielemborek <d33tah () gmail com>]

26/06/2014 15:55:37 Patrick Donnelly <batrick () batbytes com>:
> Hi Jacek,
>
> On Thu, Jun 26, 2014 at 3:49 PM, Jacek Wielemborek 
<d33tah () gmail com> wrote:
> > 26/06/2014 19:37:40 commit-mailer () nmap org:
> > > Author: devin
> > > Date: Thu Jun 26 19:37:40 2014
> > > New Revision: 33103
> > >
> > > Log:
> > > Merged changes from trunk
> > >
> > > Modified:
> > >    nmap-exp/devin/lpeg-integration/   (props changed)
> > >    nmap-exp/devin/lpeg-integration/FPEngine.cc
> > >    nmap-exp/devin/lpeg-integration/TargetGroup.cc
> > >    nmap-exp/devin/lpeg-integration/idle_scan.cc
> > >    nmap-exp/devin/lpeg-integration/libpcre/configure
> > >    nmap-exp/devin/lpeg-integration/main.cc
> > >    nmap-exp/devin/lpeg-integration/nmap-os-db
> > >    nmap-exp/devin/lpeg-integration/nmap.cc
> > >    nmap-exp/devin/lpeg-integration/nmap_amigaos.h
> > >    nmap-exp/devin/lpeg-integration/nmap_ftp.cc
> > >    nmap-exp/devin/lpeg-integration/nse_openssl.cc  
> > >    (contents,
> > >
> > > props changed) nmap-exp/devin/lpeg-integration/osscan2.cc
> > >
> > >    nmap-exp/devin/lpeg-integration/output.cc
> > >    nmap-exp/devin/lpeg-integration/scan_engine.cc
> > >    nmap-exp/devin/lpeg-integration/service_scan.cc
> > >    nmap-exp/devin/lpeg-integration/tcpip.h
> > >    nmap-exp/devin/lpeg-integration/traceroute.cc
> >
> > Hi Devin,
> >
> > David once told me that it's not the best idea to do that.
> > This way you make the patch in your branch harder to read
> > and SVN would merge the trivial changes anyway. Unless
> > something is actually required by your branch, backporting
> > it is not a good idea.
>
> AFAIK, the recommended branch workflow for SVN is to first sync
> with trunk and then merge your branch into trunk. The svn book
> still seems to says this [1]:
>
> "What happens when you finally finish your work, though? Your
> new feature is done, and you're ready to merge your branch
> changes back to the trunk (so your team can enjoy the bounty
> of your labor). The process is simple. First, bring your
> branch into sync with the trunk again, just as you've been
> doing all along[28]:"
>
> Has something changed in SVN?
>
> [1]
> http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmergin
> g.html

No idea, I never did that this way. According to my logs, I just 
entered the trunk directory and did svn merge <path to the 
branch> and it worked (it needs to be a SVN checkout though, not 
git-svn).

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Sent through the dev mailing list
http://nmap.org/mailman/listinfo/dev
Archived at http://seclists.org/nmap-dev/