Nmap Development mailing list archives
Re: [nmap-svn] r33103 - in nmap-exp/devin/lpeg-integration: . libpcre
From: Patrick Donnelly <batrick () batbytes com>
Date: Thu, 26 Jun 2014 16:22:10 -0400
On Thu, Jun 26, 2014 at 4:00 PM, Jacek Wielemborek <d33tah () gmail com> wrote:
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).
Devin was able to merge his branch to trunk using your approach: svn merge https://svn.nmap.org/nmap-exp/devin/lpeg-integration@33050 That is much easier than it used to be. Thanks for letting us know Jacek. -- Patrick Donnelly _______________________________________________ Sent through the dev mailing list http://nmap.org/mailman/listinfo/dev Archived at http://seclists.org/nmap-dev/
Current thread:
- Re: [nmap-svn] r33103 - in nmap-exp/devin/lpeg-integration: . libpcre Jacek Wielemborek (Jun 26)
- Re: [nmap-svn] r33103 - in nmap-exp/devin/lpeg-integration: . libpcre Patrick Donnelly (Jun 26)
- Re: [nmap-svn] r33103 - in nmap-exp/devin/lpeg-integration: . libpcre Jacek Wielemborek (Jun 26)
- Re: [nmap-svn] r33103 - in nmap-exp/devin/lpeg-integration: . libpcre Patrick Donnelly (Jun 26)
- Re: [nmap-svn] r33103 - in nmap-exp/devin/lpeg-integration: . libpcre Jacek Wielemborek (Jun 26)
- Re: [nmap-svn] r33103 - in nmap-exp/devin/lpeg-integration: . libpcre Patrick Donnelly (Jun 26)