diff options
| author | dougb <dougb@FreeBSD.org> | 2003-06-17 09:20:16 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2003-06-17 09:20:16 +0000 |
| commit | 073fe4a3cb57c22f3c0a9ce772356cd5deab363f (patch) | |
| tree | b281287f8c8af236bae7b40d0e45b5c71fc64a71 /contrib/bind | |
| parent | 08814850085693e835d5c236c6ad76d056bb8e33 (diff) | |
| download | FreeBSD-src-073fe4a3cb57c22f3c0a9ce772356cd5deab363f.zip FreeBSD-src-073fe4a3cb57c22f3c0a9ce772356cd5deab363f.tar.gz | |
Give an example of the more efficient conflict resolution command
suggested by the version of the commit message that's mailed out
as opposed to the more error prone version that will be suggested
when doing the actual import.
Diffstat (limited to 'contrib/bind')
| -rw-r--r-- | contrib/bind/FREEBSD-Upgrade | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/bind/FREEBSD-Upgrade b/contrib/bind/FREEBSD-Upgrade index b522712..743d740 100644 --- a/contrib/bind/FREEBSD-Upgrade +++ b/contrib/bind/FREEBSD-Upgrade @@ -17,6 +17,8 @@ cvs import -m"Import of ISC BIND version 8.3.3" src/contrib/bind ISC v8_3_3 11. Resolve conflicts as needed. +cvs checkout -jISC:yesterday -jISC src/contrib/bind + Note: bin/nslookup/commands.l needs a different patch for the command line editing customization in -current and RELENG_4. |
