List Info

Thread: Merging conflicts one way only




Merging conflicts one way only
user name
2007-06-22 03:40:59
I am trying to resolve a conflict, and the diff window only
allows me to copy
changes from the repository's version to my side (ie.
incoming only). 

In tortoiseSVN I can copy changes in either direction.

Is this a bug?

-- 
View this message in context: http://www.nabble.com/Merging-confl
icts-one-way-only-tf3963441.html#a11248265
Sent from the subclipse - users mailing list archive at
Nabble.com.

------------------------------------------------------------
---------
To unsubscribe, e-mail: users-unsubscribesubclipse.tigris.org
For additional commands, e-mail: users-helpsubclipse.tigris.org


Subclipse JavaHL causes JVM crash when reading checkout from 1.4.4 client
country flaguser name
United Kingdom
2007-06-22 04:19:11
I used the SVN 1.4.4 command line client to update my
checkouts, and it then
become impossible to start up Eclipse again - Subclipse
would cause a JVM death
on trying to read the workspace. I enclose a crash dump at
the base of this
mail. This was with Subclipse 1.2.2 - I tested the issue
with 2 different JVMs
(a 1.6 and a 1.5) and it was consistent. The only way to
dispel the problem
(for now) was point Eclipse at a fresh workspace, set it to
use SVNKit pure
Java SVN provider, then copy the configuration file it
generated back into my
original workspace.

OS is Windows 2000.

Shall I JIRA this?

Cheers,
A.




#
# An unexpected error has been detected by Java Runtime
Environment:
#
#  EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x3e047c0c,
pid=21864,
tid=21576
#
# Java VM: Java HotSpot(TM) Client VM (1.6.0-b105 mixed
mode)
# Problematic frame:
# C  [libapr-1.dll+0x7c0c]
#
# If you would like to submit a bug report, please visit:
#   http:
//java.sun.com/webapps/bugreport/crash.jsp
#

---------------  T H R E A D  ---------------

Current thread (0x3c32f800):  JavaThread
"Worker-1" [_thread_in_native,
id=21576]

siginfo: ExceptionCode=0xc0000005, reading address
0x00000000

Registers:
EAX=0x3df3d088, EBX=0x00000000, ECX=0x00000000,
EDX=0x00000000
ESP=0x3daa8670, EBP=0x3daa867c, ESI=0x01516bc8,
EDI=0x00000000
EIP=0x3e047c0c, EFLAGS=0x00010246

Top of Stack: (sp=0x3daa8670)
0x3daa8670:   00000000 01516bc8 3df3d088 3daaa6a8
0x3daa8680:   3e031f32 3daaa6a4 3df3d088 00000000
0x3daa8690:   00000000 00000000 01516bc8 3df3d088
0x3daa86a0:   00000000 3df3d088 00000000 3df3d088
0x3daa86b0:   3df3d128 6eec84f1 3df3d088 00000010
0x3daa86c0:   6ee40000 6eec11f2 3df3d088 3df3d128
0x3daa86d0:   6eec1210 6eec8610 3df3d088 3df3d0d8
0x3daa86e0:   3df3d088 3df3d088 00000001 003a0065

Instructions: (pc=0x3e047c0c)
0x3e047bfc:   89 55 10 53 8b 5d 14 56 57 85 db 75 03 8b 58
18
0x3e047c0c:   8b 03 bf 01 00 00 00 3b c7 0f 82 19 01 00 00
8b


Stack: [0x3da60000,0x3dab0000),  sp=0x3daa8670,  free
space=289k
Native frames: (J=compiled Java code, j=interpreted, Vv=VM
code, C=native code)
C  [libapr-1.dll+0x7c0c]
C  [libapriconv-1.dll+0x1f32]
C  [libapriconv-1.dll+0x1da4]
C  [_tbl_simple.so+0x123b]
C  [_tbl_simple.so+0x11c4]

Java frames: (J=compiled Java code, j=interpreted, Vv=VM
code)
j 
org.tigris.subversion.javahl.SVNClient.status(Ljava/lang/Str
ing;ZZZZZ)[Lorg/tigris/subversion/javahl/Status;+0
j 
org.tigris.subversion.svnclientadapter.javahl.AbstractJhlCli
entAdapter.getStatus(Ljava/io/File;ZZZZ)[Lorg/tigris/subvers
ion/svnclientadapter/ISVNStatus;+83
j 
org.tigris.subversion.svnclientadapter.javahl.AbstractJhlCli
entAdapter.getStatus(Ljava/io/File;ZZZ)[Lorg/tigris/subversi
on/svnclientadapter/ISVNStatus;+7
j 
org.tigris.subversion.svnclientadapter.javahl.AbstractJhlCli
entAdapter.getStatus(Ljava/io/File;ZZ)[Lorg/tigris/subversio
n/svnclientadapter/ISVNStatus;+5
j 
org.tigris.subversion.subclipse.core.status.RecursiveStatusU
pdateStrategy.statusesToUpdate(Lorg/eclipse/core/resources/I
Resource;)[Lorg/tigris/subversion/svnclientadapter/ISVNStatu
s;+96
j 
org.tigris.subversion.subclipse.core.status.StatusCacheManag
er.basicGetStatus(Lorg/eclipse/core/resources/IResource;Lorg
/tigris/subversion/subclipse/core/status/StatusUpdateStrateg
y;)Lorg/tigris/subversion/subclipse/core/resources/LocalReso
urceStatus;+26
J 
org.tigris.subversion.subclipse.core.status.StatusCacheManag
er.getStatus(Lorg/eclipse/core/resources/IResource;Lorg/tigr
is/subversion/subclipse/core/status/StatusUpdateStrategy;)Lo
rg/tigris/subversion/subclipse/core/resources/LocalResourceS
tatus;
J 
org.tigris.subversion.subclipse.core.resources.LocalResource
.getStatus()Lorg/tigris/subversion/subclipse/core/resources/
LocalResourceStatus;
j 
org.tigris.subversion.subclipse.core.resources.LocalResource
.isManaged()Z+13
j 
org.tigris.subversion.subclipse.core.resources.LocalFolder.m
embers(Lorg/eclipse/core/runtime/IProgressMonitor;I)[Lorg/ti
gris/subversion/subclipse/core/ISVNResource;+242
j 
org.tigris.subversion.subclipse.core.resources.LocalFolder.i
sDirty()Z+22
j 
org.tigris.subversion.subclipse.core.resources.LocalFolder.i
sDirty()Z+37
j 
org.tigris.subversion.subclipse.core.resources.LocalFolder.i
sDirty()Z+37
j 
org.tigris.subversion.subclipse.ui.decorator.SVNLightweightD
ecorator.isDirty(Lorg/tigris/subversion/subclipse/core/ISVNL
ocalResource;)Z+75
j 
org.tigris.subversion.subclipse.ui.decorator.SVNLightweightD
ecorator.decorate(Ljava/lang/Object;Lorg/eclipse/jface/viewe
rs/IDecoration;)V+105
j 
org.eclipse.ui.internal.decorators.LightweightDecoratorDefin
ition.decorate(Ljava/lang/Object;Lorg/eclipse/jface/viewers/
IDecoration;)V+53
j 
org.eclipse.ui.internal.decorators.LightweightDecoratorManag
er$LightweightRunnable.run()V+12
J 
org.eclipse.core.runtime.Platform.run(Lorg/eclipse/core/runt
ime/ISafeRunnable;)V
j 
org.eclipse.ui.internal.decorators.LightweightDecoratorManag
er.decorate(Ljava/lang/Object;Lorg/eclipse/ui/internal/decor
ators/DecorationBuilder;Lorg/eclipse/ui/internal/decorators/
LightweightDecoratorDefinition;)V+14
j 
org.eclipse.ui.internal.decorators.LightweightDecoratorManag
er.getDecorations(Ljava/lang/Object;Lorg/eclipse/ui/internal
/decorators/DecorationBuilder;)V+29
j 
org.eclipse.ui.internal.decorators.DecorationScheduler$1.ens
ureResultCached(Ljava/lang/Object;ZLorg/eclipse/jface/viewer
s/IDecorationContext;)V+66
j 
org.eclipse.ui.internal.decorators.DecorationScheduler$1.run
(Lorg/eclipse/core/runtime/IProgressMonitor;)Lorg/eclipse/co
re/runtime/IStatus;+132
j  org.eclipse.core.internal.jobs.Worker.run()V+42
v  ~StubRoutines::call_stub

---------------  P R O C E S S  ---------------

Java Threads: ( => current thread )
  0x3d0f0800 JavaThread "Worker-4"
[_thread_in_Java, id=22044]
  0x3d0f1800 JavaThread "Worker-3"
[_thread_blocked, id=21788]
  0x3d109000 JavaThread "Worker-2"
[_thread_blocked, id=21832]
=>0x3c32f800 JavaThread "Worker-1"
[_thread_in_native, id=21576]
  0x3cfb8000 JavaThread
"org.eclipse.jdt.internal.ui.text.JavaReconciler"
daemon
[_thread_blocked, id=21728]
  0x3c2d2800 JavaThread "Java indexing" daemon
[_thread_blocked, id=21736]
  0x3c0bc000 JavaThread "Worker-0"
[_thread_blocked, id=21816]
  0x3bd41800 JavaThread "Start Level Event
Dispatcher" daemon [_thread_blocked,
id=21856]
  0x3bdfb400 JavaThread "Framework Event
Dispatcher" daemon [_thread_blocked,
id=21776]
  0x3baad800 JavaThread "State Data Manager"
daemon [_thread_blocked, id=21532]
  0x3ba3c400 JavaThread "Low Memory Detector"
daemon [_thread_blocked, id=21780]
  0x3ba37c00 JavaThread "CompilerThread0" daemon
[_thread_blocked, id=22112]
  0x3ba36800 JavaThread "Attach Listener" daemon
[_thread_blocked, id=21544]
  0x3ba35800 JavaThread "Signal Dispatcher" daemon
[_thread_blocked, id=21700]
  0x3ba26400 JavaThread "Finalizer" daemon
[_thread_blocked, id=22056]
  0x3ba22000 JavaThread "Reference Handler" daemon
[_thread_blocked, id=21260]
  0x01475000 JavaThread "main" [_thread_in_native,
id=21744]

Other Threads:
  0x3ba1f000 VMThread [id=21972]
  0x3ba3dc00 WatcherThread [id=21804]

VM state:not at safepoint (normal execution)

VM Mutex/Monitor currently owned by a thread: 
([mutex/lock_event])
[0x01474ba0/0x000002cc] Heap_lock - owner thread:
0x3c0bc000

Heap
 def new generation   total 6976K, used 1113K [0x03620000,
0x03db0000,
0x07130000)
  eden space 6208K,   6% used [0x03620000, 0x0367ef78,
0x03c30000)
  from space 768K, 100% used [0x03cf0000, 0x03db0000,
0x03db0000)
  to   space 768K,   0% used [0x03c30000, 0x03c30000,
0x03cf0000)
 tenured generation   total 92000K, used 65790K [0x07130000,
0x0cb08000,
0x33620000)
   the space 92000K,  71% used [0x07130000, 0x0b16fa00,
0x0b16fa00, 0x0cb08000)
 compacting perm gen  total 65536K, used 36653K [0x33620000,
0x37620000,
0x3b620000)
   the space 65536K,  55% used [0x33620000, 0x359eb740,
0x359eb800, 0x37620000)
No shared spaces configured.

Dynamic libraries:
0x00400000 - 0x00423000 	e:jawa16jrebinjavaw.exe
0x77f80000 - 0x77ffb000 	D:WINNTsystem32ntdll.dll
0x7c2d0000 - 0x7c332000 	D:WINNTsystem32ADVAPI32.dll
0x7c4e0000 - 0x7c599000 	D:WINNTsystem32KERNEL32.DLL
0x77d30000 - 0x77da1000 	D:WINNTsystem32RPCRT4.DLL
0x77e10000 - 0x77e75000 	D:WINNTsystem32USER32.dll
0x77f40000 - 0x77f7c000 	D:WINNTsystem32GDI32.DLL
0x7c340000 - 0x7c396000 	e:jawa16jrebinmsvcr71.dll
0x6d7c0000 - 0x6da07000 	e:jawa16jrebinclientjvm.dll
0x77570000 - 0x775a0000 	D:WINNTsystem32WINMM.dll
0x01500000 - 0x0150c000 	D:WINNTsystem32rddv1005.dll
0x78000000 - 0x78045000 	D:WINNTsystem32MSVCRT.dll
0x6d310000 - 0x6d318000 	e:jawa16jrebinhpi.dll
0x690a0000 - 0x690ab000 	D:WINNTsystem32PSAPI.DLL
0x6d770000 - 0x6d77c000 	e:jawa16jrebinverify.dll
0x6d3b0000 - 0x6d3cf000 	e:jawa16jrebinjava.dll
0x6d7b0000 - 0x6d7bf000 	e:jawa16jrebinzip.dll
0x6d570000 - 0x6d583000 	E:jawa16jrebinnet.dll
0x75030000 - 0x75044000 	D:WINNTsystem32WS2_32.dll
0x75020000 - 0x75028000 	D:WINNTsystem32WS2HELP.DLL
0x6d590000 - 0x6d599000 	E:jawa16jrebinnio.dll
0x3c480000 - 0x3c4d2000
	E:eclipseconfigurationorg.eclipse.osgibundles2081.cp
swt-win32-3235.dll
0x77a50000 - 0x77b47000 	D:WINNTsystem32ole32.dll
0x77b50000 - 0x77bd9000 	D:WINNTsystem32COMCTL32.dll
0x76b30000 - 0x76b6e000 	D:WINNTsystem32comdlg32.dll
0x77c70000 - 0x77cba000 	D:WINNTsystem32SHLWAPI.DLL
0x782f0000 - 0x78538000 	D:WINNTsystem32SHELL32.DLL
0x779b0000 - 0x77a4b000 	D:WINNTsystem32OLEAUT32.dll
0x75e60000 - 0x75e7a000 	D:WINNTsystem32IMM32.dll
0x66650000 - 0x666a4000 	D:WINNTsystem32USP10.dll
0x76c00000 - 0x76c74000 	D:WINNTsystem32WININET.dll
0x6a8f0000 - 0x6a910000 	D:WINNTsystem32MSVFW32.dll
0x3ca40000 - 0x3ca48000
	E:eclipseconfigurationorg.eclipse.osgibundles241.cp
oswin32x86localfile_1_0_0.dll
0x69640000 - 0x6965f000 	D:WINNTsystem32oleacc.dll
0x3ccb0000 - 0x3ccc3000
	E:eclipseconfigurationorg.eclipse.osgibundles2081.cp
swt-gdip-win32-3235.dll
0x70d00000 - 0x70e91000 	D:WINNTsystem32gdiplus.dll
0x775a0000 - 0x77626000 	D:WINNTsystem32CLBCATQ.DLL
0x75d50000 - 0x75dd2000 	D:WINNTsystem32mlang.dll
0x6b2c0000 - 0x6b2c5000 	D:WINNTsystem32msimg32.dll
0x6eec0000 - 0x6eee1000
	E:eclipsepluginsorg.tigris.subversion.javahl.win32_1.2.2
libapr.dll
0x74ff0000 - 0x75002000 	D:WINNTsystem32MSWSOCK.dll
0x77980000 - 0x779a4000 	D:WINNTsystem32DNSAPI.DLL
0x75050000 - 0x75058000 	D:WINNTsystem32WSOCK32.DLL
0x6ee50000 - 0x6ee59000
	E:eclipsepluginsorg.tigris.subversion.javahl.win32_1.2.2
libapriconv.dll
0x3dbe0000 - 0x3dce8000
	E:eclipsepluginsorg.tigris.subversion.javahl.win32_1.2.2
libeay32.dll
0x3dcf0000 - 0x3ddb4000
	E:eclipsepluginsorg.tigris.subversion.javahl.win32_1.2.2
libdb44.dll
0x76080000 - 0x760e1000 	D:WINNTsystem32MSVCP60.dll
0x3ddc0000 - 0x3ddf1000
	E:eclipsepluginsorg.tigris.subversion.javahl.win32_1.2.2
ssleay32.dll
0x6ee60000 - 0x6ee89000
	E:eclipsepluginsorg.tigris.subversion.javahl.win32_1.2.2
libaprutil.dll
0x3de00000 - 0x3de12000
	E:eclipsepluginsorg.tigris.subversion.javahl.win32_1.2.2
intl3_svn.dll
0x3de20000 - 0x3df29000
	E:eclipsepluginsorg.tigris.subversion.javahl.win32_1.2.2
libsvnjavahl-1.dll
0x71300000 - 0x71308000 	D:WINNTsystem32SHFOLDER.dll
0x6ee40000 - 0x6ee45000
	e:programssvniconv_tbl_simple.so
0x3e030000 - 0x3e039000
	e:programssvnbinlibapriconv-1.dll
0x3e040000 - 0x3e060000 	e:programssvnbinlibapr-1.dll

VM Arguments:
jvm_args: -Xmx768M -XX:PermSize=64M -XX:MaxPermSize=128M
java_command: E:eclipsestartup.jar -os win32 -ws win32
-arch x86 -launcher
E:eclipseeclipse.exe -name Eclipse -showsplash 600
-exitdata 547c_50 -vm
e:jawa16jrebinjavaw.exe -vmargs -Xmx768M
-XX:PermSize=64M
-XX:MaxPermSize=128M -jar E:eclipsestartup.jar
Launcher Type: SUN_STANDARD

Environment Variables:
PATH=D:WINNTsystem32;D:WINNT;D:WINNTSystem32Wbem;D:Pr
ogram FilesCommon
FilesUlead SystemsMPEG;D:Program FilesCommon FilesMDL
SharedISIS;e:programssvnbin;I:matlabbinwin32;D:Progr
am FilesATI
TechnologiesATI.ACE;I:programsdiskeeper;E:programsgra
phvizGraphvizbin;e:programstectiassh
USERNAME=Bosmon
OS=Windows_NT
PROCESSOR_IDENTIFIER=x86 Family 15 Model 3 Stepping 2,
AuthenticAMD



---------------  S Y S T E M  ---------------

OS: Windows 2000 Build 2195 Service Pack 4

CPU:total 2 family 15, cmov, cx8, fxsr, mmx, sse, sse2,
mmxext, 3dnowext, 3dnow,
ht

Memory: 4k page, physical 2096616k(1041024k free), swap
2985424k(1916640k free)

vm_info: Java HotSpot(TM) Client VM (1.6.0-b105) for
windows-x86, built on Nov
29 2006 00:48:48 by "java_re" with unknown MS
VC++:1310



------------------------------------------------------------
----
This message was sent using IMP, the Internet Messaging
Program.

------------------------------------------------------------
---------
To unsubscribe, e-mail: users-unsubscribesubclipse.tigris.org
For additional commands, e-mail: users-helpsubclipse.tigris.org


Re: Merging conflicts one way only
user name
2007-06-22 08:15:20
On 6/22/07, Kiren Pillay <kirensetaskill.co.za> wrote:
>
> I am trying to resolve a conflict, and the diff window
only allows me to copy
> changes from the repository's version to my side (ie.
incoming only).
>
> In tortoiseSVN I can copy changes in either direction.
>
> Is this a bug?

No, it is just a difference in how the conflict editor
works.  The
editor comes from Eclipse in this case by the way, not
Subclipse.  I
believe the changes going the other way are already in the
file, so
you do not need to do anything.  Of course, both Tortoise
and Eclipse
work the same in that there is only one file being updated. 
When
Tortoise finds a conflict, it lets you pick which version
you want.
When Eclipse finds a conflict, "your" version is
already picked and
you can replace it with the other version.  The Eclipse
editor is also
an "editor" so you can also type and fix code
during this process.

Finally, the Subclipse preferences allow you to use
TortoiseMerge, or
any other external tool to do this.

-- 
Thanks

Mark Phippard
http://markphip.blogspo
t.com/

------------------------------------------------------------
---------
To unsubscribe, e-mail: users-unsubscribesubclipse.tigris.org
For additional commands, e-mail: users-helpsubclipse.tigris.org


Re: Subclipse JavaHL causes JVM crash when reading checkout from 1.4.4 client
user name
2007-06-22 08:19:38
On 6/22/07, antranigcaret.cam.ac.uk <antranigcaret.cam.ac.uk> wrote:
> I used the SVN 1.4.4 command line client to update my
checkouts, and it then
> become impossible to start up Eclipse again - Subclipse
would cause a JVM death
> on trying to read the workspace. I enclose a crash dump
at the base of this
> mail. This was with Subclipse 1.2.2 - I tested the
issue with 2 different JVMs
> (a 1.6 and a 1.5) and it was consistent. The only way
to dispel the problem
> (for now) was point Eclipse at a fresh workspace, set
it to use SVNKit pure
> Java SVN provider, then copy the configuration file it
generated back into my
> original workspace.
>
> OS is Windows 2000.
>
> Shall I JIRA this?

We do not use JIRA. 

We also are not the developers for JavaHL :(

In this case, I can tell what your problem is.  You have an
APR_ICONV_PATH environment variable and it is pointing to a
folder
that contains APR ICONV .so's that are from Apache 2.2. 
Change the
environment variable name to be APR_ICONV1_PATH and it will
resolve
the problem.

If you have an APR_ICONV_PATH environment variable, it needs
to be
pointing at the libraries from 0.9.7 of iconv.

-- 
Thanks

Mark Phippard
http://markphip.blogspo
t.com/

------------------------------------------------------------
---------
To unsubscribe, e-mail: users-unsubscribesubclipse.tigris.org
For additional commands, e-mail: users-helpsubclipse.tigris.org


[1-4]

about | contact  Other archives ( Real Estate discussion Medical topics )