Hi Nick,
Ok, I am sure you know all this but I have been told that SVN is
*very* picky about merge and re-integrate.
Your branch working directory should be a *clean* checkout of the
branch, merge with trunk and re-commit to the branch, don't change
anything other than fixing the conflicts.
On Tue, 18 Aug 2009 19:55:51 +0200
Enrico Tröger enrico.troe...@uvena.de wrote:
Maybe we could group the 'insert date', 'insert include...' items
into a new submenu, so we would save one toplevel menu item and then
we could also put various more menu items into this new submenu for
On Thu, 20 Aug 2009 20:32:17 +1000
Lex Trotman ele...@gmail.com wrote:
Ok, I am sure you know all this but I have been told that SVN is
*very* picky about merge and re-integrate.
Your branch working directory should be a *clean* checkout of the
branch, merge with trunk and re-commit to the
2009/8/20 Nick Treleaven nick.trelea...@btinternet.com:
On Thu, 20 Aug 2009 20:32:17 +1000
Lex Trotman ele...@gmail.com wrote:
Ok, I am sure you know all this but I have been told that SVN is
*very* picky about merge and re-integrate.
Your branch working directory should be a *clean*
More info below
2009/8/20 Lex Trotman ele...@gmail.com:
2009/8/20 Nick Treleaven nick.trelea...@btinternet.com:
On Thu, 20 Aug 2009 20:32:17 +1000
Lex Trotman ele...@gmail.com wrote:
Ok, I am sure you know all this but I have been told that SVN is
*very* picky about merge and re-integrate.
Hi Nick, sorry for the serial posting.
My partner just came home she said that there are problems mixing
pre-1.5 and post-1.5 clients because the former won't create
information that the latter require when merging. Where she works had
problems with this until they understood the cause. This
Enrico Tröger schrieb:
On Wed, 19 Aug 2009 10:06:20 +1000, Lex wrote:
Can it at least be auto closed, say if the script returned success
(i.e. 0)?
Well we *don't* want normal executes to do that,output should be
shown even if the program ran successfully, so some configuration is
