Byron Nevins wrote:
> I just did this:
>
> cd temp
>
> svn co svn=https://svn.dev.java.net/svn/glassfish-svn/branches/tp2/admin/cli
>
> and ListDomainsCommand.java is definitely not there!
>
> tp2 branched at rev 20092
> ListDomainsCommand.java is definitely in rev 20092 on the trunk
>
> At rev 20441 (today!) ListDomainsCommand and several more were moved to
> cli-optional
OK, so that's the problem. While Subversion does track copies (and moves
are just copies+deletes), they don't do merge across copy boundary.
So when the files are moved in the trunk and you want to merge that into
the branch, it won't work.
I know that are several tools available for helping svn merge, like
http://www.orcaware.com/svn/wiki/Svnmerge.py I wonder if this helps.
> tip -- run this from the tp2 branch:
> svn log -v --stop-on-copy
>
> ------------------------------------------
>
> Here is where the files went:
>
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/BackupCommands.java
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/BaseLifeCycleCommand.java
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/CreateDomainCommand.java
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/DatabaseCommand.java
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/DatabaseReporter.java
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/DeleteDomainCommand.java
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/DerbyControl.java
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/ListDomainsCommand.java
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/S1ASCommand.java
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/StartDatabaseCommand.java
> A
> /branches/tp2/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/StopDatabaseCommand.java
>
>
>
>
> Kedar Mhaswade wrote:
>> I am pulling my hair to merge a change from trunk onto TP-2 branch and
>> of course things don't look good.
>>
>> For example,
>>
>> https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/tp2/admin/cli/src/main/java/com/sun/enterprise/admin/cli/
>>
>>
>> shows that there is no class called ListDomainsCommand.java!
>>
>> Does it mean that this class (and hence the corresponding command
>> called list-domains) is not available for TP-2?
>>
>> Dazed and confused,
>>
>> Kedar
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: admin-unsubscribe_at_glassfish.dev.java.net
>> For additional commands, e-mail: admin-help_at_glassfish.dev.java.net
>>
>
--
Kohsuke Kawaguchi
Sun Microsystems kohsuke.kawaguchi_at_sun.com