wing up all mergeinfo would improve SVN.
propset/propedit/propdel is opaque to me, everytime I try to use it, I
spend an hour dorking around trying random combination of specs,
directories, etc.
--
Pat Farrell
http://www.pfarrell.com/
is marked as modified, but it has not been changed
in a year and was not changed in this
edit, only the "MailToBlog.java" file was modified.
--
Pat Farrell
http://www.pfarrell.com/
o anything to other files, it is marked as updated.
I have no idea how to fix it, but I sure would want to find a solution.
--
Pat Farrell
http://www.pfarrell.com/
Its time to stop the Windows vs Linux vs OS-X discussion, its reached
being pointless, and will soon escalate to a flame war.
--
Pat Farrell
http://www.pfarrell.com/
ure things?
--
Pat Farrell
http://www.pfarrell.com/
Ryan Schmidt wrote:
==>
> #!/bin/bash
>
> if [ -z "$(svn st)" ]; then
> echo "working copy is pristine"
> else
> echo "working copy has changes"
> fi
Perfect. Thanks a lot
--
Pat Farrell
http://www.pfarrell.com/
en the
svn status
return nothing, but the echo $? is still 0
I want to not do some steps if there are uncommiteed changes.
Pointers greatly appreciated.
--
Pat Farrell
http://www.pfarrell.com/
cense do you expect to use?
Is this FOSS? or commercial?
If you expect users/companies to pay for your product, this is close to
SPAM.
--
Pat Farrell
http://www.pfarrell.com/
Ed wrote:
> It's a free book written mostly by those coding the project - check
> out the repo and keep yourself up to date with cron.
> I recommend the Vendor Branching feature. think of it as a teachable moment...
>
> strange how a version control project keeps it's book in a repo
>
> no sn
Andy Levy wrote:
> On Tue, Feb 16, 2010 at 21:05, Pat Farrell wrote:
>> When will the 1.6 version, with all the "changed a lot" be part of the
>> public website?
>
> It's always been accessible, use the "nightly" version of the
> documentation.
Mike Dixon wrote:
> Incidentally, I really would recommend reading the latest version of
> the entire svn book, especially Chapter 4, Branching and Merging.
> This stuff changed a lot with 1.5 (and again with the tree conflict
> system in 1.6), and there is a lot of historical discussion that has
>
My debian server is running Lenny, the latest and greatest debian.
The svn version is svn, version 1.5.1 (r32289)
I'd like to be running 1.6.9
I can't find the .deb files, or better, a good repository to add to my
/etc/apt sources.list.
Thanks
Pat
--
Pat Farrell
http://www.pfarrell.com/
Ryan Schmidt wrote:
> Pat Farrell wrote:
>> OK, how do I edit it to kill the merge-info
>
> I'm not clear on why you're trying to defeat the merge tracking feature?
Because:
1) I have never seen it work
2) this is the trunk, and I don't want false messages wh
Daniel Shahaf wrote:
> Is that what you were seeing? (the subject says 'svn status', but I
> can't find an "'_'" in the 'svn st' code in trunk)
On further testing, the _ is only in the commit entries, but svn status
will show the " M"
No luck so far in clearing out the merge-info
indow, below the --
comment.
Sorry for not having a perfectly reproducible problem, but that is
partially why its bugging me.
svn diff shows
Modified: svn:mergeinfo
with stuff.
Would be nice to clean this up.
Thanks
Pat
--
Pat Farrell
http://www.pfarrell.com/
to do something, nearly anything, to make the sandbox's copy
match the repository and stop telling me that changes have been made.
Perhaps I need to do the propedit on the branch, not the trunk?
--
Pat Farrell
http://www.pfarrell.com/
Bean.
> What version of Subversion are you using?
svn, version 1.6.5 (r38866)
compiled Aug 31 2009, 18:42:02
Copyright (C) 2000-2009 CollabNet.
--
Pat Farrell
http://www.pfarrell.com/
Fairly often, when I do a merge from my branch to the trunk, a handful
of files are show with a
_M indication
(that is underscore in column 1 and an M in column 2)
What does this mean?
How do I clear it out?
Even blowing away the sandbox and checking out the whole tree does not
seem to clear it.
One of my developers did a
svn rm foo.java
command, and committed it. He meant well, but it was not a good idea.
I could retrieve the file from the repository with
svn update foo.java -r 1234
which would retrieve an older copy. svn would display a "A" with the file.
but svn status
showed nothin
19 matches
Mail list logo
