netbeans-netcat mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Heffelfinger <dheffelfin...@gmail.com>
Subject Re: [vcs] Subversion - Resolve conflict - Conflict resolved
Date Fri, 30 Mar 2018 10:21:56 GMT
If you can't move forward, just skip the offending test cases and add a
comment explaining the issues.

Thanks,
David

On Thu, Mar 29, 2018 at 10:21 PM, Leo Donahue <donahulf2@gmail.com> wrote:

> Debian 4.9.82-1+deb9u3 (2018-03-02) x86_64 GNU/Linux
> NetBeans-dev-incubator-netbeans-linux-378-on-20180326-basic
>
> I'm having a hard time moving forward on several test cases in Standard
> development of project.
>
> Test case 11. Resolve conflict has issues.  https://issues.
> apache.org/jira/browse/NETBEANS-544
>
> Steps from Test case 12. Conflict resolved are confusing - I can't tell
> which project of the three now in project explorer I'm supposed to select
> project root on.
>
> Test case 13. Delete file also doesn't tell me which project to pick when
> deleting the NewClass.java from package xx.yy. Any of the three projects I
> pick to delete that class did not show the "Locally Deleted" status in the
> Subversion tab.
>
> I think everything falls apart when the following lines aren't cleaned up
> from Test case 11:
>  ||||||| .r1
>
>
> Niklas, are you experiencing the same issue on Delete file?
>
> Which project did you delete from?
>   The project created from Test cases 1-9?
>   The project created in Test case 10
>   The project created in Test case 12?
>



-- 
http://ensode.net - A Guide to Java, Linux and Other Technology Topics
My Books: https://www.packtpub.com/books/info/authors/david-r-heffelfinger
<http://www.packtpub.com/authors/profiles/david-heffelfinger>
My Video Training:
http://www.packtpub.com/java-ee-development-with-netbeans-7/video
Follow me on Twitter: https://twitter.com/ensode

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message