[svk-devel] SVK and SVN interaction (svk:merge trunk property mods)

Mark Grimes mark at stateful.net
Fri Dec 8 17:45:32 EST 2006


Well I've got a sizable project that I'm working in with svk where
unlike previously I am creating branches quite often and merging between
the two.  Other then the following the workflow is working fantastic.

Is there a way to suppress the trunk svk:merge property changes.

1. Due to the trunk property changes from the merge tickets, svk commits
are easily identifiable from svn commits because the svn commit emails
look messed up as well:

e.g. source_changes at ...  [20891] trunk   <-- svk

e.g. source_changes at ...  [20893] trunk/dports/net/nmap  <-- svn

Clearly the trunk property change is trumping the modified filepath in
the commit log email subject.

2. Each branch I make for updates is being appended to each subsequent
commit and it is making the svn commit emails look horrible.

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20915
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20920
f2dd1c64-7982-4318-98ce-263798263e0a:/local:20611
+ a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20924
f2dd1c64-7982-4318-98ce-263798263e0a:/local:20611


More information about the svk-devel mailing list