104536 – dev-util/git missing app-text/rcs dependency

Bug 104536 - dev-util/git missing app-text/rcs dependency

Summary: dev-util/git missing app-text/rcs dependency

Status:	RESOLVED FIXED

Alias:	None

Product:	Gentoo Linux
Classification:	Unclassified
Component:	[OLD] Unspecified (show other bugs)
Hardware:	All Linux

Importance:	High normal (vote)
Assignee:	Carlos Silva (RETIRED)

URL:
Whiteboard:
Keywords:

Depends on:
Blocks:

Reported:	2005-09-01 20:17 UTC by Edward Middleton
Modified:	2005-09-04 12:20 UTC (History)
CC List:	0 users

See Also:
Package list:
Runtime testing required:	---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Edward Middleton 2005-09-01 20:17:41 UTC

The /usr/bin/git-merge-one-file-script line 66 requires the merge command
provided by app-text/rcs.

Reproducible: Always
Steps to Reproduce:
1. echo "dev-util/git ~amd64" >> /etc/portage/package.keywords
2. echo "dev-util/cvsps ~amd64" >> /etc/portage/package.keywords
3. emerge dev-utils/git
4. follow git tutorial till "Merging two branches" section command
      git resolve HEAD mybranch "Merge work in mybranch"
5. 
Actual Results:  
Trying to merge 404fe5b9393bdff118da373b7a5645c7297d3884 into
a1085538ad219c787c5d4dd61ad3eb794d6fe342 using
68e998ab886c24ee3dd6b0d8e149839d44c88f80.
Simple merge failed, trying Automatic merge
Auto-merging hello.
/usr/bin/git-merge-one-file-script: line 66: merge: command not found
ERROR: Merge conflict in hello.
fatal: merge program failed
Automatic merge failed, fix up by hand

Expected Results:  
Simple merge failed, trying Automatic merge
Auto-merging hello.
merge: warning: conflicts during merge
ERROR: Merge conflict in hello.
fatal: merge program failed
Automatic merge failed, fix up by hand

Comment 1 Carlos Silva (RETIRED) gentoo-dev

2005-09-04 12:20:38 UTC

Thanks for reporting. I'ts already in CVS