This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 120595

Summary:	Add fetch menu item
Product:	versioncontrol	Reporter:	Padraig Obriain <padraigob>
Component:	Mercurial	Assignee:	issues@versioncontrol <issues>
Status:	RESOLVED DUPLICATE
Severity:	blocker
Priority:	P3
Version:	6.x
Hardware:	Sun
OS:	All
Issue Type:	ENHANCEMENT	Exception Reporter:

Description Padraig Obriain 2007-10-31 11:37:02 UTC

The fetch menu item would implement the fetch extension.

fetch is a combination of "hg pull", "hg merge" and "hg update.

When I tried this on the command line with clashing changes I got the following:

bash-3.2$ cd /export/home/padraigo/JavaApplication57_clone0/
bash-3.2$ hg fetch
pulling from /export/home/padraigo/JavaApplication57
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
merging with new head 2:fd8e6e3edf14
merging src/javaapplication57/Main.java
Error : tkcvs,v7.2 does not run on i86pc architecture

0 files updated, 1 files merged, 0 files removed, 0 files unresolved
new changeset 3:b58e16ba99b7 merges remote changes with local
bash-3.2$ hg heads
changeset:   3:b58e16ba99b7
tag:         tip
parent:      1:e82d94e2fce1
parent:      2:fd8e6e3edf14
user:        padraigo <padraigo@arch>
date:        Wed Oct 31 10:29:03 2007 +0000
summary:     Automated merge with file:/export/home/padraigo/JavaApplication57

Comment 1 Padraig Obriain 2008-01-30 11:08:20 UTC


*** This issue has been marked as a duplicate of 125704 ***