[PATCH, svnmerge] Do not be fooled by external directories

[Giovanni Bajo <ra...@develer.com>]

Hello,

svnmerge.py can currently be fooled by external directories, because it
misinterprets the output of "svn status -q" so that it believes that there
are local modifies. This patch improves the logic so that a clean working
copy with external directories is not reported as "dirty" anymore.

Committed as r18009.

[[[
Do not be fooled by external directories in the tree.

* contrib/client-side/svnmerge.py:
  (check_dir_clean): Improve logic to find if the tree has local modifies.
]]]
-- 
Giovanni Bajo

Re: [PATCH, svnmerge] Do not be fooled by external directories

[Giovanni Bajo <ra...@develer.com>]

Blair Zajac <bl...@orcaware.com> wrote:

> One request I have.  I read all the commit messages before I saw your
> emails in the dev mailing list and it wasn't too clear to me from the
> commit logs all the issues that the commits were fixing.  On the
> other hand, your emails here dev are great and clear that up very
> quickly.  Could any following commits have a little more context for
> the changes?  That would help in the future and looking through old
> svn log's to determine what problems were fixed and why the commit
> was made.
>
> I'm tempted to take these emails and put them in the commit log :)


Oh no problem. I don't know "how verbose" a commit log should be. I thought
that it had to have a single paragraph as a summary, and then mechanically
lists the single changes to each file/function. If you'd rather have it more
verbose rather than less, I can do that.

Why don't you fix the ones I just committed so that I can see better what you
mean?

Thanks,
Giovanni Bajo


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH, svnmerge] Do not be fooled by external directories

[Blair Zajac <bl...@orcaware.com>]

Giovanni Bajo wrote:
> Hello,
> 
> svnmerge.py can currently be fooled by external directories, because it
> misinterprets the output of "svn status -q" so that it believes that there
> are local modifies. This patch improves the logic so that a clean working
> copy with external directories is not reported as "dirty" anymore.
> 
> Committed as r18009.
> 
> [[[
> Do not be fooled by external directories in the tree.
> 
> * contrib/client-side/svnmerge.py:
>   (check_dir_clean): Improve logic to find if the tree has local modifies.
> ]]]


Hi Giovanni,

Good to see these improvements being made.

One request I have.  I read all the commit messages before I saw your emails in 
the dev mailing list and it wasn't too clear to me from the commit logs all the 
issues that the commits were fixing.  On the other hand, your emails here dev 
are great and clear that up very quickly.  Could any following commits have a 
little more context for the changes?  That would help in the future and looking 
through old svn log's to determine what problems were fixed and why the commit 
was made.

I'm tempted to take these emails and put them in the commit log :)

Regards,
Blair


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org